Merge 3.14-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Mar 2014 18:40:15 +0000 (11:40 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Mar 2014 18:40:15 +0000 (11:40 -0700)
We want the USB fixes in here as well.

1  2 
MAINTAINERS
arch/arm/Kconfig
drivers/usb/core/config.c
drivers/usb/host/xhci.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge