Merge branch 'pxa-tosa' into pxa

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/tosa.c
	arch/arm/mach-pxa/spitz.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-pxa/Kconfig
index 1a7ceb8866f9b7264d401a7e38a96a619e839612,6c162f8fdceafc2a0852f00238340fbf7fee15de..7f9664dee6703f9f74cdc42aa42b170ce2ccc804
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -305,9 -274,11 +305,18 @@@ config PXA_SS
        help
          Enable support for PXA2xx SSP ports
  
 +config PXA_PWM
 +      tristate
 +      default BACKLIGHT_PWM
 +      help
 +        Enable support for PXA2xx/PXA3xx PWM controllers
++
+ config TOSA_BT
+       tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
+       depends on MACH_TOSA
+       select RFKILL
+       help
+         This is a simple driver that is able to control
+         the state of built in bluetooth chip on tosa.
++
  endif

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

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc include/asm-arm/arch-pxa/hardware.h
Simple merge

diff --cc include/asm-arm/arch-pxa/system.h
Simple merge