Subject: linux-next: manual merge of the arm tree with the arm-current tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 15 Dec 2010 10:54:35 +1100

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
from the arm-current tree and commit
4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
options are so marked") from the arm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/Kconfig
index d56d21c0,e77fe0f..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1310,8 -1319,8 +1319,8 @@@ config H
  	default 100
  
  config THUMB2_KERNEL
- 	bool "Compile the kernel in Thumb-2 mode"
+ 	bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"
 -	depends on CPU_V7 && EXPERIMENTAL
 +	depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL
  	select AEABI
  	select ARM_ASM_UNIFIED
  	help