]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:10:38 +0000 (15:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:10:38 +0000 (15:10 +1000)
commitcf8b95894edd53cac1060a9a191124e26941a8f9
tree3829b432518a5bde9b569e4bba6cb22d28296fe2
parent89bd28f7ece820cbfa09127b1703b7ccde0eb348
parent941ea3616c747545d0278fc432fb7919b6d0d8f0
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/gadget/udc-core.c
drivers/usb/host/ehci-tegra.c
drivers/usb/musb/omap2430.c
drivers/usb/musb/tusb6010.c
drivers/usb/Makefile
drivers/usb/gadget/udc-core.c
drivers/usb/host/Kconfig
drivers/usb/musb/musb_core.c
drivers/usb/musb/omap2430.c
drivers/usb/musb/tusb6010.c
drivers/usb/phy/Kconfig
drivers/usb/phy/phy-fsl-usb.c