]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:27:44 +0000 (15:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:27:44 +0000 (15:27 +1000)
commitc0585cda4391a277e1a2fd2ab2f0dc06859c213d
tree549f1f48ee18d2fca55672970a7db1e93ceb0da7
parentadb4b361bcedde62a8ce3b43832e6a198b13252c
parent3a0ddc714a1b8fcbff24c135a1332a28b4668d78
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/chipidea/Makefile
drivers/usb/chipidea/Makefile
drivers/usb/core/port.c
drivers/usb/gadget/f_uvc.c
drivers/usb/host/Kconfig
drivers/usb/musb/omap2430.c