| commit | 47aad66c2659b8985512b66f87bb5fe7bdc88dff | [log] [tgz] |
|---|---|---|
| author | Kevin Hilman <khilman@linaro.org> | Mon Aug 19 10:18:28 2013 -0700 |
| committer | Kevin Hilman <khilman@linaro.org> | Mon Aug 19 10:19:18 2013 -0700 |
| tree | 8e788d9ff4bacd907ba3df176eb67e87ff5c3dde | |
| parent | fea67d3dfd13bcca4daa62cbafe6f8eb99523217 [diff] | |
| parent | 3fa4d7344be0afebd80382ffeea6b1787cccf971 [diff] |
Merge tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup From Tony Lindgren: USB nop phy rename via Felipe Balbi <balbi@ti.com>: Here's a pull request of one patch to avoid conflicts during the merge window. * tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv Signed-off-by: Kevin Hilman <khilman@linaro.org>