Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits)
  ARM: Fix ioremap_cached()/ioremap_wc() for SMP platforms
  ARM: 6043/1: AT91 slow-clock resume: Don't wait for a disabled PLL to lock
  ARM: 6031/1: fix Thumb-2 decompressor
  ARM: 6029/1: ep93xx: gpio.c: local functions should be static
  ARM: 6028/1: ARM: add MAINTAINERS for U300
  ARM: 6024/1: bcmring: fix missing down on semaphore in dma.c
  MXC: mach_armadillo5x0: Add USB Host support.
  ARM mach-mx3: duplicated include
  ARM mach-mx3: duplicated include
  imx31: add watchdog device on litekit board.
  imx3: Add watchdog platform device support
  MXC: mach-mx31_3ds: add support for freescale mc13783 power management device.
  MXC: mach-mx31_3ds: Add SPI1 device support.
  MXC: mach-mx31_3ds: Add support for on board NAND Flash.
  MXC: mach-mx31_3ds: Update variable names over recent mach name modification.
  imx31: fix parent clock for rtc
  i.MX51: remove NFC AXI static mapping
  i.MX51: determine silicon revision dynamically
  i.MX51: map TZIC dynamically
  i.MX51: Use correct clock for gpt
  ...

diff --combined MAINTAINERS
index 7a9ccda2a3070183af6f19e361181ed2bc1bade2,6eb978ee321caae80366361857b467fff3395290..5b422908d0f3dafc2ffda2624e8e9b4a9b53d5bf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -971,6 -971,16 +971,16 @@@ L:       [email protected]
  W:    http://www.mcuos.com
  S:    Maintained
  
+ ARM/U300 MACHINE SUPPORT
+ M:    Linus Walleij <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    arch/arm/mach-u300/
+ F:    drivers/i2c/busses/i2c-stu300.c
+ F:    drivers/rtc/rtc-coh901331.c
+ F:    drivers/watchdog/coh901327_wdt.c
+ F:    drivers/dma/coh901318*
+ 
  ARM/U8500 ARM ARCHITECTURE
  M:    Srinidhi Kasagar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2474,6 -2484,12 +2484,6 @@@ L:     [email protected]
  S:    Odd Fixes
  F:    drivers/char/hvc_*
  
 -VIRTIO CONSOLE DRIVER
 -M:    Amit Shah <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/char/virtio_console.c
 -
  iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
  M:    Peter Jones <[email protected]>
  M:    Konrad Rzeszutek Wilk <[email protected]>
@@@ -5965,13 -5981,6 +5975,13 @@@ S:    Maintaine
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
  
 +VIRTIO CONSOLE DRIVER
 +M:    Amit Shah <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/char/virtio_console.c
 +F:    include/linux/virtio_console.h
 +
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <[email protected]>
  L:    [email protected]