]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 05:18:31 +0000 (15:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 05:18:31 +0000 (15:18 +1000)
commit2728ada1aa81d3dfa2b7ea0d61509e88a136aa79
tree13306215571f65dd65205df795eb89fdc59aa506
parent5593d9c157bc6ff8576ed0dbd8ff79cedaabf0dc
parente695abb3c8b1b758843a1db2a73c98b3d14c173a
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
drivers/usb/gadget/f_fs.c
drivers/usb/gadget/f_rndis.c
drivers/usb/gadget/rndis.c
drivers/usb/gadget/storage_common.c
drivers/usb/gadget/u_ether.c
drivers/usb/musb/musb_dsps.c
drivers/usb/phy/Kconfig