summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-08-19 19:18:28 +0200
committerKevin Hilman <khilman@linaro.org>2013-08-19 19:19:18 +0200
commit47aad66c2659b8985512b66f87bb5fe7bdc88dff (patch)
tree8e788d9ff4bacd907ba3df176eb67e87ff5c3dde /Documentation
parentMerge tag 'soc-3.12' of git://git.infradead.org/linux-mvebu into next/cleanup (diff)
parentusb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv (diff)
downloadlinux-47aad66c2659b8985512b66f87bb5fe7bdc88dff.tar.xz
linux-47aad66c2659b8985512b66f87bb5fe7bdc88dff.zip
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 'Documentation')
0 files changed, 0 insertions, 0 deletions