]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 06:36:42 +0000 (16:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 06:36:42 +0000 (16:36 +1000)
commit6d2f7eae210bf566bd528a0171c67d29a8036562
tree62bf845219817cb6a3f39846f8b1cc87e1eee9f3
parent417843dcbb974e74f698dbf1dfd7128efa943983
parent4601de807d7755aabd35faf5e15ae233241b8582
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/serial/usb-serial.c
27 files changed:
arch/arm/Kconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/mips/Kconfig
arch/powerpc/platforms/512x/Kconfig
arch/sparc/Kconfig
drivers/Makefile
drivers/hid/usbhid/hid-core.c
drivers/net/usb/cdc_mbim.c
drivers/net/usb/qmi_wwan.c
drivers/power/Kconfig
drivers/usb/class/cdc-acm.c
drivers/usb/core/usb.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/lpc32xx_udc.c
drivers/usb/host/sl811-hcd.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/keyspan_pda.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
drivers/usb/serial/option.c
drivers/usb/serial/quatech2.c
drivers/usb/serial/sierra.c
drivers/usb/serial/ti_usb_3410_5052.c
drivers/usb/serial/usb-serial.c
drivers/usb/storage/scsiglue.c