Merge 3.12-rc4 into usb-next

We want the USB fixes in this branch as well.

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

diff --combined MAINTAINERS
index 78ef5dca25437cad96d6ce3ed3687a37be5afa1d,8a0cbf3cf2c8c01c5be662eef372eff4060daffc..a70e33a088f8103155c007cbea8cf90eb3cbc4d5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -824,15 -824,21 +824,21 @@@ S:      Maintaine
  F:    arch/arm/mach-gemini/
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
- M:    Barry Song <baohua.song@csr.com>
+ M:    Barry Song <baohua@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
  S:    Maintained
  F:    arch/arm/mach-prima2/
+ F:    drivers/clk/clk-prima2.c
+ F:    drivers/clocksource/timer-prima2.c
+ F:    drivers/clocksource/timer-marco.c
  F:    drivers/dma/sirf-dma.c
  F:    drivers/i2c/busses/i2c-sirf.c
+ F:    drivers/input/misc/sirfsoc-onkey.c
+ F:    drivers/irqchip/irq-sirfsoc.c
  F:    drivers/mmc/host/sdhci-sirf.c
  F:    drivers/pinctrl/sirf/
+ F:    drivers/rtc/rtc-sirfsoc.c
  F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -3667,14 -3673,6 +3673,14 @@@ S:    Maintaine
  F:    include/asm-generic/
  F:    include/uapi/asm-generic/
  
 +GENERIC PHY FRAMEWORK
 +M:    Kishon Vijay Abraham I <kishon@ti.com>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
 +S:    Supported
 +F:    drivers/phy/
 +F:    include/linux/phy/
 +
  GENERIC UIO DRIVER FOR PCI DEVICES
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
@@@ -4478,6 -4476,13 +4484,13 @@@ L:    linux-serial@vger.kernel.or
  S:    Maintained
  F:    drivers/tty/serial/ioc3_serial.c
  
+ IOMMU DRIVERS
+ M:    Joerg Roedel <joro@8bytes.org>
+ L:    iommu@lists.linux-foundation.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
+ S:    Maintained
+ F:    drivers/iommu/
+ 
  IP MASQUERADING
  M:    Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
  S:    Maintained
@@@ -7279,9 -7284,9 +7292,9 @@@ F:      include/linux/sched.
  F:    include/uapi/linux/sched.h
  
  SCORE ARCHITECTURE
- M:    Chen Liqin <liqin.chen@sunplusct.com>
+ M:    Chen Liqin <liqin.linux@gmail.com>
  M:    Lennox Wu <lennox.wu@gmail.com>
- W:    http://www.sunplusct.com
+ W:    http://www.sunplus.com
  S:    Supported
  F:    arch/score/
  
@@@ -9386,6 -9391,7 +9399,7 @@@ F:      arch/arm64/include/asm/xen
  
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <ian.campbell@citrix.com>
+ M:    Wei Liu <wei.liu2@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
  S:    Supported