]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:07:28 +0000 (15:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:07:28 +0000 (15:07 +1100)
commit2adb1d7c64b10e3ad626f0a775227ac5858261ef
tree9ea18e98e26e5116c3b8bab5c79735b76b250c3c
parent0a978bf0826d59fba996364945c1a05e0745571f
parentb240add62c7c0e15bfaba59fa37bd44480e31681
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
arch/mips/loongson1/common/platform.c
drivers/usb/core/hcd.c
drivers/usb/musb/musb_gadget.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/option.c
drivers/usb/serial/usb_wwan.c