]> git.karo-electronics.de Git - karo-tx-linux.git/commit - drivers/media/usb/gspca/gspca.c
Merge remote-tracking branch 'usb-gadget/next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:25 +0000 (14:59 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:25 +0000 (14:59 +0200)
commit1f4cc4a22c3dbb50e46728b8907271a03d202cb0
tree1b3ecfb3b6272c4ee29f28a00dd19864ffe0823c
parent06fe40dcff8a82d56520bd661f0284321bd6e4db
parent80d7d8a768cda6e8a08ab805a977d08741011da1
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/musb/davinci.c
arch/arm/mach-omap2/board-omap3beagle.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