]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Apr 2014 05:20:33 +0000 (15:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Apr 2014 05:20:33 +0000 (15:20 +1000)
commitd348e530b392dd6f3ae57513756a8b4aa157d645
tree526346bdf54c29252b14927681fd43920880a0fa
parent4683ef454d5e7d192dccf9aec2eed07f1a3e8564
parent041832565e405d2e2ea218632b7bcafa87deaece
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
drivers/usb/dwc3/core.c
drivers/usb/dwc3/gadget.c