]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge 3.14-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 23:59:22 +0000 (15:59 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 23:59:22 +0000 (15:59 -0800)
commit3c701651c8c5f35e846512070cdbf2f5980db62c
tree529271b31a849062491afce37527cb41dab65746
parentf6723b569a67aa4042b4ddc72822bf7f4395f3d2
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691
Merge 3.14-rc4 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-omap2/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/usb/phy/phy-msm-usb.c