Merge 3.12-rc3 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/chipidea/core.c
Simple merge

diff --cc drivers/usb/chipidea/udc.c
Simple merge

diff --cc drivers/usb/core/devio.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/dwc3/dwc3-pci.c
Simple merge

diff --cc drivers/usb/host/ehci-fsl.c
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/usb/host/uhci-pci.c
Simple merge