Merge branch 'pxa-palm' into pxa-machines

Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-pxa/Kconfig
Simple merge

diff --cc arch/arm/mach-pxa/Makefile
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
index 10c44d3,371d22a..5dba165
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -50,26 -50,15 +50,35 @@@ config HTC_PASIC
          HTC Magician devices, respectively. Actual functionality is
          handled by the leds-pasic3 and ds1wm drivers.
  
+ config UCB1400_CORE
+       tristate "Philips UCB1400 Core driver"
+       help
+         This enables support for the Philips UCB1400 core functions.
+         The UCB1400 is an AC97 audio codec.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called ucb1400_core.
+ 
 +config MFD_TMIO
 +      bool
 +      default n
 +
 +config MFD_T7L66XB
 +      bool "Support Toshiba T7L66XB"
 +      depends on ARM
 +      select MFD_CORE
 +      select MFD_TMIO
 +      help
 +        Support for Toshiba Mobile IO Controller T7L66XB
 +
 +config MFD_TC6387XB
 +      bool "Support Toshiba TC6387XB"
 +      depends on ARM
 +      select MFD_CORE
 +      select MFD_TMIO
 +      help
 +        Support for Toshiba Mobile IO Controller TC6387XB
 +
  config MFD_TC6393XB
        bool "Support Toshiba TC6393XB"
        depends on GPIOLIB && ARM

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc drivers/pcmcia/Makefile
index 20c5b06,c6d89fd..679ca92
--- 1/drivers/pcmcia/Makefile
--- 2/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -71,7 -71,7 +71,8 @@@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)             += s
  pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)              += pxa2xx_lubbock.o sa1111_generic.o
  pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)            += pxa2xx_mainstone.o
  pxa2xx_cs-$(CONFIG_PXA_SHARPSL)                       += pxa2xx_sharpsl.o
 -pxa2xx_cs-$(CONFIG_MACH_ARMCORE)              += pxa2xx_cm_x270.o
 +pxa2xx_cs-$(CONFIG_MACH_ARMCORE)              += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
 +pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA)            += pxa2xx_trizeps.o
- pxa2xx_cs-$(CONFIG_MACH_PALMTX)               += pxa2xx_palmtx.o
+ pxa2xx_cs-$(CONFIG_MACH_PALMTX)                       += pxa2xx_palmtx.o
+ pxa2xx_cs-$(CONFIG_MACH_PALMLD)                       += pxa2xx_palmld.o