Merge remote-tracking branch 'dwmw2/master'

Conflicts:
	arch/x86/Kconfig

diff --cc arch/powerpc/Kconfig
index 17903f1f356be5790d6ddcde1ff3d5eabaf2ed78,064e418d8b373608d1a2181d937dff7c68abf12a..684fa6456797df07f6a98d1eabce6d66a8c88f60
--- 1/arch/powerpc/Kconfig
--- 2/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 225543bf45a5ca551f9609b18cf8711f729f71e7,2ab0f0c60ffe15d259b2f411717a97750b337c54..2e49e6d21b2b5b68dabf6da415b7649dcc771f2f
--- 1/arch/x86/Kconfig
--- 2/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