From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Feb 2013 23:37:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'dwmw2/master'
X-Git-Tag: next-20130220~118
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3adafed6730b74b030966e954e1a12a8e353549b;p=karo-tx-linux.git

Merge remote-tracking branch 'dwmw2/master'

Conflicts:
	arch/x86/Kconfig
---

3adafed6730b74b030966e954e1a12a8e353549b
diff --cc arch/powerpc/Kconfig
index 17903f1f356b,064e418d8b37..684fa6456797
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -141,9 -141,12 +141,10 @@@ config PP
  	select GENERIC_CLOCKEVENTS
  	select GENERIC_STRNCPY_FROM_USER
  	select GENERIC_STRNLEN_USER
 -	select GENERIC_KERNEL_THREAD
  	select HAVE_MOD_ARCH_SPECIFIC
  	select MODULES_USE_ELF_RELA
 -	select GENERIC_KERNEL_EXECVE
  	select CLONE_BACKWARDS
+ 	select ARCH_USE_BUILTIN_BSWAP
  
  config EARLY_PRINTK
  	bool
diff --cc arch/x86/Kconfig
index 225543bf45a5,2ab0f0c60ffe..2e49e6d21b2b
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -113,7 -113,9 +113,8 @@@ config X8
  	select MODULES_USE_ELF_REL if X86_32
  	select MODULES_USE_ELF_RELA if X86_64
  	select CLONE_BACKWARDS if X86_32
+ 	select ARCH_USE_BUILTIN_BSWAP
 +	select GENERIC_SIGALTSTACK
  
  config INSTRUCTION_DECODER
  	def_bool y