]> 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, 19 May 2014 06:12:21 +0000 (16:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:12:21 +0000 (16:12 +1000)
commit8b1fe48739d7beab7530abe529e4d9a5cc65cdec
treea782d6049f4853a9d5a7f1de862721965c9a8c6e
parenta6d5a493bcbe300a2c2cb7c685d35629fd8426e0
parent7751b6fb05869bcb318e74420148c06577adf894
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