Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC fixes from Olof Johansson:
 "Another week, another batch of fixes.

  Again, OMAP regressions due to move to DT is the bulk of the changes
  here, but this should be the last of it for 3.13.  There are also a
  handful of OMAP hwmod changes (power management, reset handling) for
  USB on OMAP3 that fixes some longish-standing bugs around USB resets.

  There are a couple of other changes that also add up line count a bit:
  One is a long-standing bug with the keyboard layout on one of the PXA
  platforms.  The other is a fix for highbank that moves their
  power-off/reset button handling to be done in-kernel since relying on
  userspace to handle it was fragile and awkward"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: sun6i: dt: Fix interrupt trigger types
  ARM: sun7i: dt: Fix interrupt trigger types
  MAINTAINERS: merge IMX6 entry into IMX
  ARM: tegra: add missing break to fuse initialization code
  ARM: pxa: prevent PXA270 occasional reboot freezes
  ARM: pxa: tosa: fix keys mapping
  ARM: OMAP2+: omap_device: add fail hook for runtime_pm when bad data is detected
  ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present
  ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module
  ARM: OMAP2+: hwmod: Fix SOFTRESET logic
  ARM: OMAP4+: hwmod data: Don't prevent RESET of USB Host module
  ARM: dts: Fix booting for secure omaps
  ARM: OMAP2+: Fix the machine entry for am3517
  ARM: dts: Fix missing entries for am3517
  ARM: OMAP2+: Fix overwriting hwmod data with data from device tree
  ARM: davinci: Fix McASP mem resource names
  ARM: highbank: handle soft poweroff and reset key events
  ARM: davinci: fix number of resources passed to davinci_gpio_register()
  gpio: davinci: fix check for unbanked gpio

diff --combined MAINTAINERS
index 9486fb6fe38ecb44b1653df1d4c573ad7f2845eb,1db904450e87cf6f610f4e24365c64dc2be06b09..00b655f117a701de7c0cd560785190b1707513b7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -893,20 -893,15 +893,15 @@@ F:      arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
+ M:    Shawn Guo <[email protected]>
  M:    Sascha Hauer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
- T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
+ T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
  F:    arch/arm/mach-imx/
+ F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
- ARM/FREESCALE IMX6
- M:    Shawn Guo <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Maintained
- T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
- F:    arch/arm/mach-imx/*imx6*
- 
  ARM/FREESCALE MXS ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2138,8 -2133,7 +2133,8 @@@ S:      Maintaine
  F:    Documentation/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Alexander Shishkin <[email protected]>
 +M:    Peter Chen <[email protected]>
 +T:    git://github.com/hzpeterchen/linux-usb.git
  L:    [email protected]
  S:    Maintained
  F:    drivers/usb/chipidea/
@@@ -4045,14 -4039,6 +4040,14 @@@ W:    http://artax.karlin.mff.cuni.cz/~mik
  S:    Maintained
  F:    fs/hpfs/
  
 +HSI SUBSYSTEM
 +M:    Sebastian Reichel <[email protected]>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-hsi
 +F:    drivers/hsi/
 +F:    include/linux/hsi/
 +F:    include/uapi/linux/hsi/
 +
  HSO 3G MODEM DRIVER
  M:    Jan Dumon <[email protected]>
  W:    http://www.pharscape.org