Merge 3.12-rc6 into usb-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:19:07 +0000 (13:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:19:07 +0000 (13:19 -0700)
commit5584cfbafc1a4c2a465f4423d351bb918c64cad0
treef74dcc1ba5a6790cb3e69629696aff58bdfd827a
parent1653d2f88f43f6780eace1faeeb7b7adde8c10fb
parent31d141e3a666269a3b6fcccddb0351caf7454240
Merge 3.12-rc6 into usb-next.

We want those USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
arch/arm/boot/dts/omap3-beagle-xm.dts
drivers/usb/core/quirks.c
drivers/usb/host/pci-quirks.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h
drivers/usb/musb/musb_gadget.c