]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 05:20:05 +0000 (15:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 05:20:05 +0000 (15:20 +1000)
commit2fa6c75b02c032252eaf3c0b8885ddb1b9ad4840
treeaa031dfe8244f59a1b17dcbf8f5da008d839e53a
parentc6cfba346fd28e392b081bc676871a73340584ba
parent79cb5b533aa9dbb05123b3b7d170e686da558a35
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
12 files changed:
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/fsl_udc_core.c
drivers/usb/gadget/inode.c
drivers/usb/gadget/rndis.c
drivers/usb/gadget/storage_common.c
drivers/usb/gadget/tcm_usb_gadget.c
drivers/usb/gadget/u_ether.c
drivers/usb/musb/musb_dsps.c
drivers/usb/phy/Kconfig