]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:35:02 +0000 (13:35 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:35:02 +0000 (13:35 +0200)
commit36229aa5d377c98e22c7d818110eaae0df5739a5
treeb9b45fb75c49a507fab58424a7c546b83b709728
parent963676d7205014b7bdd964eb55a907c2243155f9
parent80d7d8a768cda6e8a08ab805a977d08741011da1
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/musb/davinci.c
drivers/phy/phy-twl4030-usb.c
drivers/usb/gadget/storage_common.c
drivers/usb/musb/Kconfig
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_dsps.c
drivers/usb/musb/musb_virthub.c
drivers/usb/musb/omap2430.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
include/linux/usb/usb_phy_gen_xceiv.h