]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 04:24:11 +0000 (14:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 04:24:11 +0000 (14:24 +1000)
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c

1  2 
drivers/usb/dwc3/core.c
drivers/usb/dwc3/gadget.c

Simple merge
Simple merge