]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 03:36:24 +0000 (14:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 03:36:24 +0000 (14:36 +1100)
Conflicts:
drivers/usb/early/ehci-dbgp.c
drivers/usb/musb/ux500.c

1  2 
drivers/usb/musb/musb_gadget.c
drivers/usb/serial/usb_wwan.c

Simple merge
Simple merge