Merge master.kernel.org:/home/rmk/linux-2.6-arm

Manual conflict merge of arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index 4a63a8e,77eee38..15dc1a0
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -139,7 -153,8 +156,9 @@@ config ARCH_L720
  
  config ARCH_PXA
        bool "PXA2xx-based"
 +      select ARCH_MTD_XIP
+       help
+         Support for Intel's PXA2XX processor line.
  
  config ARCH_RPC
        bool "RiscPC"
@@@ -156,7 -171,8 +175,9 @@@ config ARCH_SA110
        bool "SA1100-based"
        select ISA
        select ARCH_DISCONTIGMEM_ENABLE
 +      select ARCH_MTD_XIP
+       help
+         Support for StrongARM 11x0 based boards.
  
  config ARCH_S3C2410
        bool "Samsung S3C2410"