From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Feb 2006 23:20:40 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.16-rc3~56
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cce0cac125623f9b68f25dd1350f6d616220a8dd;p=linux-2.6-omap-h63xx.git

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

Manual conflict merge of arch/arm/Kconfig
---

cce0cac125623f9b68f25dd1350f6d616220a8dd
diff --cc arch/arm/Kconfig
index 4a63a8e2e45,77eee38762d..15dc1a0dffb
--- a/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"