]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb-gadget/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 04:18:23 +0000 (15:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 04:18:23 +0000 (15:18 +1100)
commit388ce9618d4ff69394214a0925e10eba95f682d3
tree9c17e000b394bde97778457b83ae1cacae022897
parent0ba1d9d39d0b93a293d113b37efe4d68406feb07
parent9b192de60b5a584ee4ed967fb6758773c75e4643
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/chipidea/udc.c
drivers/usb/gadget/net2272.c
drivers/usb/gadget/net2280.c
drivers/usb/host/ehci-tegra.c
22 files changed:
drivers/Makefile
drivers/power/Kconfig
drivers/usb/chipidea/udc.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/f_rndis.c
drivers/usb/gadget/g_ffs.c
drivers/usb/gadget/lpc32xx_udc.c
drivers/usb/gadget/net2272.c
drivers/usb/gadget/net2280.c
drivers/usb/gadget/udc-core.c
drivers/usb/host/Kconfig
drivers/usb/host/ehci-mv.c
drivers/usb/host/ehci-s5p.c
drivers/usb/host/ehci-tegra.c
drivers/usb/musb/da8xx.c
drivers/usb/musb/musb_gadget.c
drivers/usb/phy/Kconfig
drivers/usb/phy/phy-isp1301-omap.c
drivers/usb/phy/phy-mv-u3d-usb.c
drivers/usb/phy/phy-twl4030-usb.c
drivers/usb/phy/phy-twl6030-usb.c