summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-08-19 10:18:28 -0700
committerKevin Hilman <khilman@linaro.org>2013-08-19 10:19:18 -0700
commit47aad66c2659b8985512b66f87bb5fe7bdc88dff (patch)
tree8e788d9ff4bacd907ba3df176eb67e87ff5c3dde /arch/arm/mach-zynq
parentfea67d3dfd13bcca4daa62cbafe6f8eb99523217 (diff)
parent3fa4d7344be0afebd80382ffeea6b1787cccf971 (diff)
downloadop-kernel-dev-47aad66c2659b8985512b66f87bb5fe7bdc88dff.zip
op-kernel-dev-47aad66c2659b8985512b66f87bb5fe7bdc88dff.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-zynq')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud