]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 04:53:12 +0000 (15:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 04:53:12 +0000 (15:53 +1100)
commit035e7f2877672dfb826eee69243143e523bcade3
tree109741d80054bfb791ab1acd24c7c3121ba7bda6
parentdc530304923f6bcc8c38fe1736c711ae5cb4aceb
parent3c1b2c3ecd3122fe6dded7b012f74021144d95b2
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
arch/arm/mach-tegra/Kconfig
arch/arm/Kconfig
arch/arm/mach-omap2/Kconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-tegra/Kconfig
arch/mips/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/usb/host/Kconfig