Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	arch/arm/Kconfig

diff --combined MAINTAINERS
index c16cce6,9d7e056..776a5a4
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -616,10 -616,10 +616,10 @@@ M:      Richard Purdie <rpurdie@rpsys.net
  S:    Maintained
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
 -M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
 +M:    Paulius Zaleckas <paulius.zaleckas@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://gitorious.org/linux-gemini/mainline.git
 -S:    Maintained
 +S:    Odd Fixes
  F:    arch/arm/mach-gemini/
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -641,9 -641,9 +641,9 @@@ T: topgit git://git.openezx.org/openezx
  F:    arch/arm/mach-pxa/ezx.c
  
  ARM/FARADAY FA526 PORT
 -M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
 +M:    Paulius Zaleckas <paulius.zaleckas@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 +S:    Odd Fixes
  F:    arch/arm/mm/*-fa*
  
  ARM/FOOTBRIDGE ARCHITECTURE
@@@ -662,12 -662,6 +662,12 @@@ T:       git://git.pengutronix.de/git/imx/lin
  F:    arch/arm/mach-mx*/
  F:    arch/arm/plat-mxc/
  
 +ARM/FREESCALE IMX51
 +M:    Amit Kucheria <amit.kucheria@canonical.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-mx5/
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -941,6 -935,16 +941,16 @@@ W:       http://www.fluff.org/ben/linux
  S:    Maintained
  F:    arch/arm/mach-s3c6410/
  
+ ARM/SHMOBILE ARM ARCHITECTURE
+ M:    Paul Mundt <lethal@linux-sh.org>
+ M:    Magnus Damm <magnus.damm@gmail.com>
+ L:    linux-sh@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
+ W:    http://oss.renesas.com
+ S:    Supported
+ F:    arch/arm/mach-shmobile/
+ F:    drivers/sh/
+ 
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -3417,10 -3421,8 +3427,10 @@@ S:    Maintaine
  F:    drivers/scsi/sym53c8xx_2/
  
  LTP (Linux Test Project)
 -M:    Subrata Modak <subrata@linux.vnet.ibm.com>
 -M:    Mike Frysinger <vapier@gentoo.org>
 +M:    Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 +M:    Garrett Cooper <yanegomi@gmail.com>
 +M:     Mike Frysinger <vapier@gentoo.org>
 +M:     Subrata Modak <subrata@linux.vnet.ibm.com>
  L:    ltp-list@lists.sourceforge.net (subscribers-only)
  W:    http://ltp.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
@@@ -3844,7 -3846,6 +3854,7 @@@ NETWORKING DRIVER
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
  S:    Odd Fixes
  F:    drivers/net/
  F:    include/linux/if_*
@@@ -4428,13 -4429,6 +4438,13 @@@ L:    linux-arm-kernel@lists.infradead.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
  S:    Maintained
  
 +MMP2 SUPPORT (aka ARMADA610)
 +M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Eric Miao <eric.y.miao@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 +S:    Maintained
 +
  PXA MMCI DRIVER
  S:    Orphan
  

diff --combined arch/arm/Kconfig
index 7ac8386,55764a1..ee74c3a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -310,9 -310,10 +310,9 @@@ config ARCH_MX
        bool "Freescale MXC/iMX-based"
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
 -      select ARCH_MTD_XIP
 -      select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
 +      select COMMON_CLKDEV
        help
          Support for Freescale MXC/iMX-based family of processors
  
@@@ -496,7 -497,7 +496,7 @@@ config ARCH_ORION5
          Orion-2 (5281), Orion-1-90 (6183).
  
  config ARCH_MMP
 -      bool "Marvell PXA168/910"
 +      bool "Marvell PXA168/910/MMP2"
        depends on MMU
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
@@@ -507,7 -508,7 +507,7 @@@
        select TICK_ONESHOT
        select PLAT_PXA
        help
 -        Support for Marvell's PXA168/910 processor line.
 +        Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
  
  config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
@@@ -583,6 -584,11 +583,11 @@@ config ARCH_MS
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
  
+ config ARCH_SHMOBILE
+       bool "Renesas SH-Mobile"
+       help
+         Support for Renesas's SH-Mobile ARM platforms
+ 
  config ARCH_RPC
        bool "RiscPC"
        select ARCH_ACORN
@@@ -632,14 -638,6 +637,14 @@@ config ARCH_S3C64X
        help
          Samsung S3C64XX series based systems
  
 +config ARCH_S5P6440
 +      bool "Samsung S5P6440"
 +      select CPU_V6
 +      select GENERIC_GPIO
 +      select HAVE_CLK
 +      help
 +        Samsung S5P6440 CPU based systems
 +
  config ARCH_S5PC1XX
        bool "Samsung S5PC1XX"
        select GENERIC_GPIO
@@@ -813,7 -811,6 +818,7 @@@ source "arch/arm/plat-samsung/Kconfig
  source "arch/arm/plat-s3c24xx/Kconfig"
  source "arch/arm/plat-s3c64xx/Kconfig"
  source "arch/arm/plat-s3c/Kconfig"
 +source "arch/arm/plat-s5p/Kconfig"
  source "arch/arm/plat-s5pc1xx/Kconfig"
  
  if ARCH_S3C2410
@@@ -830,8 -827,8 +835,10 @@@ source "arch/arm/mach-s3c6400/Kconfig
  source "arch/arm/mach-s3c6410/Kconfig"
  endif
  
 +source "arch/arm/mach-s5p6440/Kconfig"
 +
+ source "arch/arm/mach-shmobile/Kconfig"
+ 
  source "arch/arm/plat-stmp3xxx/Kconfig"
  
  if ARCH_S5PC1XX
@@@ -1085,7 -1082,7 +1092,7 @@@ source kernel/Kconfig.preemp
  config HZ
        int
        default 128 if ARCH_L7200
 -      default 200 if ARCH_EBSA110 || ARCH_S3C2410
 +      default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440
        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
        default AT91_TIMER_HZ if ARCH_AT91
        default 100

diff --combined arch/arm/Makefile
index a99aafe,177775f..10e933b
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -146,7 -146,6 +146,7 @@@ machine-$(CONFIG_ARCH_MX1)         := mx
  machine-$(CONFIG_ARCH_MX2)            := mx2
  machine-$(CONFIG_ARCH_MX25)           := mx25
  machine-$(CONFIG_ARCH_MX3)            := mx3
 +machine-$(CONFIG_ARCH_MX5)            := mx5
  machine-$(CONFIG_ARCH_MXC91231)               := mxc91231
  machine-$(CONFIG_ARCH_NETX)           := netx
  machine-$(CONFIG_ARCH_NOMADIK)                := nomadik
@@@ -163,10 -162,10 +163,11 @@@ machine-$(CONFIG_ARCH_RPC)              := rp
  machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
  machine-$(CONFIG_ARCH_S3C24A0)                := s3c24a0
  machine-$(CONFIG_ARCH_S3C64XX)                := s3c6400 s3c6410
 +machine-$(CONFIG_ARCH_S5P6440)                := s5p6440
  machine-$(CONFIG_ARCH_S5PC1XX)                := s5pc100
  machine-$(CONFIG_ARCH_SA1100)         := sa1100
  machine-$(CONFIG_ARCH_SHARK)          := shark
+ machine-$(CONFIG_ARCH_SHMOBILE)       := shmobile
  machine-$(CONFIG_ARCH_STMP378X)               := stmp378x
  machine-$(CONFIG_ARCH_STMP37XX)               := stmp37xx
  machine-$(CONFIG_ARCH_U300)           := u300
@@@ -187,7 -186,6 +188,7 @@@ plat-$(CONFIG_PLAT_PXA)            := px
  plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx s3c samsung
  plat-$(CONFIG_PLAT_S3C64XX)   := s3c64xx s3c samsung
  plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx s3c samsung
 +plat-$(CONFIG_PLAT_S5P)               := s5p samsung s3c
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.

diff --combined drivers/serial/Kconfig
index ebdd2b9,406ad91..df62f4e
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -459,7 -459,7 +459,7 @@@ config SERIAL_SAMSUNG_UART
        int
        depends on ARM && PLAT_S3C
        default 2 if ARCH_S3C2400
 -      default 4 if ARCH_S5PC1XX || ARCH_S3C64XX || CPU_S3C2443
 +      default 4 if ARCH_S5P6440 || ARCH_S5PC1XX || ARCH_S5PV210 || ARCH_S3C64XX || CPU_S3C2443
        default 3
        help
          Select the number of available UART ports for the Samsung S3C
@@@ -526,11 -526,11 +526,11 @@@ config SERIAL_S3C24A
          Serial port support for the Samsung S3C24A0 SoC
  
  config SERIAL_S3C6400
 -      tristate "Samsung S3C6400/S3C6410 Serial port support"
 -      depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410)
 +      tristate "Samsung S3C6400/S3C6410/S5P6440 Serial port support"
 +      depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440)
        default y
        help
 -        Serial port support for the Samsung S3C6400 and S3C6410
 +        Serial port support for the Samsung S3C6400, S3C6410 and S5P6440
          SoCs
  
  config SERIAL_S5PC100
@@@ -540,13 -540,6 +540,13 @@@
        help
          Serial port support for the Samsung S5PC100 SoCs
  
 +config SERIAL_S5PV210
 +      tristate "Samsung S5PV210 Serial port support"
 +      depends on SERIAL_SAMSUNG && CPU_S5PV210
 +      default y
 +      help
 +        Serial port support for Samsung's S5P Family of SoC's
 +
  config SERIAL_MAX3100
        tristate "MAX3100 support"
        depends on SPI
@@@ -1003,7 -996,7 +1003,7 @@@ config SERIAL_IP22_ZILOG_CONSOL
  
  config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
-       depends on HAVE_CLK && (SUPERH || H8300)
+       depends on HAVE_CLK && (SUPERH || H8300 || ARCH_SHMOBILE)
        select SERIAL_CORE
  
  config SERIAL_SH_SCI_NR_UARTS