]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:38:04 +0000 (15:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:38:04 +0000 (15:38 +1100)
commit913bd6974a339f7d71b300d2f5c3c01a87870395
tree645029c394aa4bb90de65766dc9607b67e67a41f
parent45b3160df7493d62108fc135a492b7a3aff08a6a
parente2ced16661b807b0a5db4f00000eaeb21da4b251
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-vt8500.c
drivers/usb/musb/omap2430.c
drivers/usb/phy/omap-usb2.c
25 files changed:
MAINTAINERS
arch/arm/mach-omap2/board-omap3evm.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/fusb300_udc.c
drivers/usb/gadget/m66592-udc.c
drivers/usb/gadget/pxa25x_udc.c
drivers/usb/gadget/r8a66597-udc.c
drivers/usb/gadget/s3c-hsotg.c
drivers/usb/gadget/s3c-hsudc.c
drivers/usb/gadget/u_serial.c
drivers/usb/host/ehci-mxc.c
drivers/usb/host/ehci-omap.c
drivers/usb/host/ehci-vt8500.c
drivers/usb/musb/musb_dsps.c
drivers/usb/otg/mxs-phy.c
drivers/usb/serial/Kconfig
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/mct_u232.c
drivers/usb/serial/quatech2.c
drivers/usb/serial/sierra.c
drivers/usb/serial/ssu100.c
drivers/usb/serial/usb_wwan.c