]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'usb.current/usb-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 00:30:37 +0000 (10:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 00:30:37 +0000 (10:30 +1000)
Conflicts:
drivers/usb/host/ohci-nxp.c

1  2 
drivers/usb/host/ohci-nxp.c

Simple merge