Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac...

Conflicts:

	arch/arm/mach-pxa/poodle.c

diff --combined MAINTAINERS
index 28c69aaefcd94601a1bf8e3d096e2f89a5d1b5a8,08350812e8630651acadbb6f74b7f5d75299f975,28c69aaefcd94601a1bf8e3d096e2f89a5d1b5a8,186be3ba50694c2c7a10f98cb9eaf2fd4c153b6f,28c69aaefcd94601a1bf8e3d096e2f89a5d1b5a8,28c69aaefcd94601a1bf8e3d096e2f89a5d1b5a8,28c69aaefcd94601a1bf8e3d096e2f89a5d1b5a8,186be3ba50694c2c7a10f98cb9eaf2fd4c153b6f..d02ee7b6cd91bea122df78e1daa60cf02b27ad9f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/MAINTAINERS
--- 8/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@@@ -222,8 -222,8 -222,8 -222,7 -222,8 -222,8 -222,8 -222,7 +222,7 @@@@@@@@@ W:   http://code.google.com/p/aceracp
        S:      Maintained
        
        ACPI
--- --- P:      Andi Kleen
--- --- M:      ak@linux.intel.com
+++ +++ P:      Len Brown
        M:      lenb@kernel.org
        L:      linux-acpi@vger.kernel.org
        W:      http://www.lesswatts.org/projects/acpi/
@@@@@@@@@ -419,6 -419,6 -419,6 -418,12 -419,6 -419,6 -419,6 -418,12 +418,12 @@@@@@@@@ L:        linux-laptop@vger.kernel.or
        W:      http://www.canb.auug.org.au/~sfr/
        S:      Supported
        
+++ +++ APPLE BCM5974 MULTITOUCH DRIVER
+++ +++ P:      Henrik Rydberg
+++ +++ M:      rydberg@euromail.se
+++ +++ L:      linux-input@vger.kernel.org
+++ +++ S:      Maintained
+++ +++ 
        APPLE SMC DRIVER
        P:      Nicolas Boichat
        M:      nicolas@boichat.ch
@@@@@@@@@ -486,7 -486,7 -486,7 -491,7 -486,7 -486,7 -486,7 -491,7 +491,7 @@@@@@@@@ M:   kernel@wantstofly.or
        L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
        S:      Maintained
        
- ------ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+ ++++++ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
        P:      Mike Rapoport
        M:      mike@compulab.co.il
        L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@@@@@@@@ -745,11 -745,11 -745,11 -750,13 -745,11 -745,11 -745,11 -750,13 +750,13 @@@@@@@@@ P:  Ville Syrjal
        M:      syrjala@sci.fi
        S:      Maintained
        
--- --- ATL1 ETHERNET DRIVER
+++ +++ ATLX ETHERNET DRIVERS
        P:      Jay Cliburn
        M:      jcliburn@gmail.com
        P:      Chris Snook
        M:      csnook@redhat.com
+++ +++ P:      Jie Yang
+++ +++ M:      jie.yang@atheros.com
        L:      atl1-devel@lists.sourceforge.net
        W:      http://sourceforge.net/projects/atl1
        W:      http://atl1.sourceforge.net
@@@@@@@@@ -1588,7 -1588,7 -1588,7 -1595,7 -1588,7 -1588,7 -1588,7 -1595,7 +1595,7 @@@@@@@@@ S:  Supporte
        EMBEDDED LINUX
        P:      Paul Gortmaker
        M:      paul.gortmaker@windriver.com
--- --- P       David Woodhouse
+++ +++ P:      David Woodhouse
        M:      dwmw2@infradead.org
        L:      linux-embedded@vger.kernel.org
        S:      Maintained
@@@@@@@@@ -3051,7 -3051,7 -3051,7 -3058,7 -3051,7 -3051,7 -3051,7 -3058,7 +3058,7 @@@@@@@@@ P:  Anton Altaparmako
        M:      aia21@cantab.net
        L:      linux-ntfs-dev@lists.sourceforge.net
        L:      linux-kernel@vger.kernel.org
--- --- W:      http://linux-ntfs.sf.net/
+++ +++ W:      http://www.linux-ntfs.org/
        T:      git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
        S:      Maintained
        
@@@@@@@@@ -4005,7 -4005,7 -4005,7 -4012,7 -4005,7 -4005,7 -4005,7 -4012,7 +4012,7 @@@@@@@@@ S:      Maintaine
        
        TI OMAP MMC INTERFACE DRIVER
        P:      Carlos Aguiar, Anderson Briglia and Syed Khasim
--- --- M:      linux-omap-open-source@linux.omap.com (subscribers only)
+++ +++ M:      linux-omap@vger.kernel.org
        W:      http://linux.omap.com
        W:      http://www.muru.com/linux/omap/
        S:      Maintained

diff --combined arch/arm/mach-pxa/Kconfig
index 2c4851a35308461ad3966474a146aaec29a04c98,40d1d21b9e2999173c3b7834765425af40ab5913,e8ee7ec9ff6dda45d0a0793c9887b37b2592769a,e8ee7ec9ff6dda45d0a0793c9887b37b2592769a,9a387637cd6c214cb8b931d56e919c10872b4962,7238bb77f5da712237d37f2afdf7db982f6181c5,4ef9ad17f224e003fe23eea20099c6181e609644,e8ee7ec9ff6dda45d0a0793c9887b37b2592769a..4618f7c2e375f0a9ae5ff20cd71129f63e04ea51
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
--- 3/arch/arm/mach-pxa/Kconfig
--- 4/arch/arm/mach-pxa/Kconfig
--- 5/arch/arm/mach-pxa/Kconfig
--- 6/arch/arm/mach-pxa/Kconfig
--- 7/arch/arm/mach-pxa/Kconfig
--- 8/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@@@@@@@ -49,6 -49,6 -49,6 -49,6 -49,6 -49,10 -49,6 -49,6 +49,10 @@@@@@@@@ config MACH_MAINSTON
                select PXA27x
                select HAVE_PWM
        
+++++ ++config MACH_MP900C
+++++ ++        bool "Nec Mobilepro 900/c"
+++++ ++        select PXA25x
+++++ ++
        config ARCH_PXA_IDP
                bool "Accelent Xscale IDP"
                select PXA25x
@@@@@@@@@ -189,6 -189,6 -189,6 -189,6 -189,6 -193,6 -189,7 -189,6 +193,7 @@@@@@@@@ config MACH_COLIBR
        config MACH_ZYLONITE
                bool "PXA3xx Development Platform (aka Zylonite)"
                select PXA3xx
++++++ +        select PXA_SSP
                select HAVE_PWM
        
        config MACH_LITTLETON
@@@@@@@@@ -207,15 -207,22 -207,15 -207,15 -207,27 -211,15 -208,15 -207,15 +212,34 @@@@@@@@@ config MACH_SAA
                select PXA930
        
        config MACH_ARMCORE
- ------        bool "CompuLab CM-X270 modules"
+ ++++++        bool "CompuLab CM-X255/CM-X270 modules"
                select PXA27x
                select IWMMXT
+ ++++++        select PXA25x
+ ++++++        select PXA_SSP
+ ++++++
+ ++++++config MACH_CM_X300
+ ++++++        bool "CompuLab CM-X300 modules"
+ ++++++        select PXA3xx
+ ++++++        select CPU_PXA300
        
        config MACH_MAGICIAN
                bool "Enable HTC Magician Support"
                select PXA27x
                select IWMMXT
        
++++ +++config MACH_MIOA701
++++ +++        bool "Mitac Mio A701 Support"
++++ +++        select PXA27x
++++ +++        select IWMMXT
++++ +++        select LEDS_GPIO
++++ +++        select HAVE_PWM
++++ +++        select GPIO_SYSFS
++++ +++        help
++++ +++          Say Y here if you intend to run this kernel on a
++++ +++          MIO A701. Currently there is only basic support
++++ +++          for this PDA.
++++ +++
        config MACH_PCM027
                bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
                select PXA27x
@@@@@@@@@ -256,9 -263,6 -256,6 -256,6 -268,6 -260,6 -257,6 -256,6 +280,9 @@@@@@@@@ config PCM990_DISPLAY_NON
        
        endchoice
        
 +++++++config MACH_AM200EPD
 +++++++        depends on MACH_GUMSTIX_F
 +++++++        bool "Enable AM200EPD board support"
        
        config PXA_EZX
                bool "Motorola EZX Platform"

diff --combined arch/arm/mach-pxa/Makefile
index ccbe1b08f88ebdbce665563507806e80d086593e,f0dfc9689ed4aaa7133fcd4bb48ca09143ba74a9,99ecbe7f85062a343db152dec067f7889c629a3b,fbedaaf74bd3835dbdae71d8bc6e6cb1de319bf8,0e5fc7e8c7c22f8f8c2905bec488b20a589ace8b,ac0e8e39c79a64b641a53c49a0fe09729b72f529,99ecbe7f85062a343db152dec067f7889c629a3b,fbedaaf74bd3835dbdae71d8bc6e6cb1de319bf8..3b9454616d9565636efb6839b025d93e3a5a7e46
--- 1/arch/arm/mach-pxa/Makefile
--- 2/arch/arm/mach-pxa/Makefile
--- 3/arch/arm/mach-pxa/Makefile
--- 4/arch/arm/mach-pxa/Makefile
--- 5/arch/arm/mach-pxa/Makefile
--- 6/arch/arm/mach-pxa/Makefile
--- 7/arch/arm/mach-pxa/Makefile
--- 8/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@@@@@@@@ -22,22 -22,21 -22,21 -22,20 -22,22 -22,22 -22,21 -22,20 +22,23 @@@@@@@@@ obj-$(CONFIG_CPU_PXA930)     += pxa930.
        
        # Specific board support
        obj-$(CONFIG_ARCH_GUMSTIX)      += gumstix.o
 +++++++obj-$(CONFIG_MACH_AM200EPD)     += am200epd.o
        obj-$(CONFIG_ARCH_LUBBOCK)      += lubbock.o
        obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
        obj-$(CONFIG_MACH_MAINSTONE)    += mainstone.o
+++++ ++obj-$(CONFIG_MACH_MP900C)       += mp900.o
        obj-$(CONFIG_ARCH_PXA_IDP)      += idp.o
        obj-$(CONFIG_MACH_TRIZEPS4)     += trizeps4.o
        obj-$(CONFIG_MACH_COLIBRI)      += colibri.o
--- --- obj-$(CONFIG_PXA_SHARP_C7xx)    += corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o
--- --- obj-$(CONFIG_PXA_SHARP_Cxx00)   += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o
--- --- obj-$(CONFIG_MACH_AKITA)        += akita-ioexp.o
--- --- obj-$(CONFIG_MACH_POODLE)       += poodle.o corgi_ssp.o
+++ +++ obj-$(CONFIG_PXA_SHARP_C7xx)    += corgi.o sharpsl_pm.o corgi_pm.o
+++ +++ obj-$(CONFIG_PXA_SHARP_Cxx00)   += spitz.o sharpsl_pm.o spitz_pm.o
+++ +++ obj-$(CONFIG_MACH_POODLE)       += poodle.o
        obj-$(CONFIG_MACH_PCM027)       += pcm027.o
        obj-$(CONFIG_MACH_PCM990_BASEBOARD)     += pcm990-baseboard.o
        obj-$(CONFIG_MACH_TOSA)         += tosa.o
        obj-$(CONFIG_MACH_EM_X270)      += em-x270.o
        obj-$(CONFIG_MACH_MAGICIAN)     += magician.o
++++ +++obj-$(CONFIG_MACH_MIOA701)      += mioa701.o mioa701_bootresume.o
        obj-$(CONFIG_ARCH_PXA_ESERIES)  += eseries.o eseries_udc.o
        obj-$(CONFIG_MACH_E740)         += e740_lcd.o
        obj-$(CONFIG_MACH_E750)         += e750_lcd.o
@@@@@@@@@ -54,7 -53,8 -53,7 -52,7 -54,7 -54,7 -53,7 -52,7 +55,8 @@@@@@@@@ obj-$(CONFIG_MACH_LITTLETON)  += littlet
        obj-$(CONFIG_MACH_TAVOREVB)     += tavorevb.o
        obj-$(CONFIG_MACH_SAAR)         += saar.o
        
- ------obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o
+ ++++++obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx.o cm-x255.o cm-x270.o
+ ++++++obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
        obj-$(CONFIG_PXA_EZX)           += ezx.o
        
        # Support for blinky lights
@@@@@@@@@ -67,7 -67,7 -66,7 -65,7 -67,7 -67,7 -66,7 -65,7 +69,7 @@@@@@@@@ led-$(CONFIG_MACH_TRIZEPS4)   += leds-tri
        obj-$(CONFIG_LEDS)              += $(led-y)
        
        ifeq ($(CONFIG_PCI),y)
- ------obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
+ ++++++obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o
        endif
        
        obj-$(CONFIG_TOSA_BT)           += tosa-bt.o