]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 03:06:15 +0000 (13:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 03:06:15 +0000 (13:06 +1000)
commit99ea1e4d24e23d80a28fb5c679b7b828afa773fc
tree6280b1113e86e4ed67e421f503a0cb39f21c1fe1
parent6bc9cbd789257a81a27d2b4346b0000b896ecc6f
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