Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
  ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
  ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
  ARM: 6322/1: imx/pca100: Fix name of spi platform data
  ARM: 6321/1: fix syntax error in main Kconfig file
  ARM: 6297/1: move U300 timer to dynamic clock lookup
  ARM: 6296/1: clock U300 intcon and timer properly
  ARM: 6295/1: fix U300 apb_pclk split
  ARM: 6306/1: fix inverted MMC card detect in U300
  ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
  ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
  ARM: 6292/1: coresight: add ETM management registers
  ARM: 6288/1: ftrace: document mcount formats
  ARM: 6287/1: ftrace: clean up mcount assembly indentation
  ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
  ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
  ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
  ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
  ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
  ARM: S5PV210: Override FIMC driver name on Aquila board
  ARM: S5PC100: enable FIMC on SMDKC100
  ...

Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/dma-mapping.h
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/mach-s5pc100/cpu.c
index ecab982a38b9f036af1318b702114cc91cab2ed4,799d22f41fcd8fdcd864e35275c0a70a600404ec..251c92ac5b227e05a28251ed7b890ff1f84eccfb
--- 1/arch/arm/mach-s5pc100/cpu.c
--- 2/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@@ -38,10 -38,11 +38,12 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/clock.h>
+ #include <plat/ata-core.h>
  #include <plat/iic-core.h>
  #include <plat/sdhci.h>
+ #include <plat/adc-core.h>
  #include <plat/onenand-core.h>
 +#include <plat/fb-core.h>
  
  #include <plat/s5pc100.h>
  
@@@ -93,7 -96,7 +97,8 @@@ void __init s5pc100_map_io(void
        s3c_i2c1_setname("s3c2440-i2c");
  
        s3c_onenand_setname("s5pc100-onenand");
 +      s3c_fb_setname("s5pc100-fb");
+       s3c_cfcon_setname("s5pc100-pata");
  }
  
  void __init s5pc100_init_clocks(int xtal)

diff --cc arch/arm/mach-s5pc100/mach-smdkc100.c
Simple merge

diff --cc arch/arm/mach-s5pv210/cpu.c
index ffd8b17c363a5c2b0d722e8351b80c1690d78adc,c7e0b8a65c4a56746a2cf65c7a45fe1c42798c96..b9f4d677cf5541460747a5086fb25f5fbcea744e
--- 1/arch/arm/mach-s5pv210/cpu.c
--- 2/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@@ -31,10 -31,14 +31,15 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/clock.h>
 +#include <plat/fb-core.h>
  #include <plat/s5pv210.h>
+ #include <plat/adc-core.h>
+ #include <plat/ata-core.h>
+ #include <plat/fimc-core.h>
  #include <plat/iic-core.h>
+ #include <plat/keypad-core.h>
  #include <plat/sdhci.h>
+ #include <plat/reset.h>
  
  /* Initial IO mappings */
  
@@@ -93,7 -107,8 +108,10 @@@ void __init s5pv210_map_io(void
        s3c_i2c1_setname("s3c2440-i2c");
        s3c_i2c2_setname("s3c2440-i2c");
  
 +      s3c_fb_setname("s5pv210-fb");
++
+       /* Use s5pv210-keypad instead of samsung-keypad */
+       samsung_keypad_setname("s5pv210-keypad");
  }
  
  void __init s5pv210_init_clocks(int xtal)

diff --cc arch/arm/mach-s5pv210/mach-aquila.c
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc include/linux/serial_core.h
index 8129ca2d57e3955df394a2a6f9979ed4ac289e11,522832023a698369c87916a5844e39046245eb22..3c2ad99fed347e282d913ea2ad43082b6606b248
--- 1/include/linux/serial_core.h
--- 2/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -186,12 -186,9 +186,15 @@@
  #define PORT_ALTERA_JTAGUART  91
  #define PORT_ALTERA_UART      92
  
+ /* SH-SCI */
+ #define PORT_SCIFB    93
+ 
 +/* MAX3107 */
 +#define PORT_MAX3107  94
 +
 +/* High Speed UART for Medfield */
 +#define PORT_MFD      95
 +
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>