]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:23:40 +0000 (15:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:23:40 +0000 (15:23 +1100)
Conflicts:
drivers/usb/host/ehci-timer.c

1  2 
drivers/usb/class/cdc-acm.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c

Simple merge
Simple merge
Simple merge