]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 23:03:12 +0000 (00:03 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 23:03:12 +0000 (00:03 +0100)
commit1fc79f1057b1a6b1d5aa761cd20826b3cd646e75
treecb39e3ca211f51f3553e94d8b71cc51edc26dacd
parentbffde881c8e78130feae43531a5e3016054ef0a8
parent80d7d8a768cda6e8a08ab805a977d08741011da1
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/musb/davinci.c
drivers/phy/phy-twl4030-usb.c
drivers/usb/gadget/storage_common.c
drivers/usb/musb/Kconfig
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_dsps.c
drivers/usb/musb/musb_virthub.c
drivers/usb/musb/omap2430.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
include/linux/usb/usb_phy_gen_xceiv.h