From: H. Peter Anvin <hpa@linux.intel.com>
Date: Tue, 12 Feb 2013 23:47:45 +0000 (-0800)
Subject: Merge tag 'v3.8-rc7' into x86/asm
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=8ecba5af948cb58bf6d5eb1537c0df53cbc319c4;hp=-c;ds=sidebyside

Merge tag 'v3.8-rc7' into x86/asm

Merge in the updates to head_32.S from the previous urgent branch, as
upcoming patches will make further changes.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

8ecba5af948cb58bf6d5eb1537c0df53cbc319c4
diff --combined arch/x86/Kconfig
index 3e941aa7535,225543bf45a..430204cfc0f
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -114,7 -114,6 +114,7 @@@ config X8
  	select MODULES_USE_ELF_RELA if X86_64
  	select CLONE_BACKWARDS if X86_32
  	select GENERIC_SIGALTSTACK
 +	select ARCH_USE_BUILTIN_BSWAP
  
  config INSTRUCTION_DECODER
  	def_bool y
@@@ -2139,6 -2138,7 +2139,7 @@@ config OLPC_XO1_RT
  config OLPC_XO1_SCI
  	bool "OLPC XO-1 SCI extras"
  	depends on OLPC && OLPC_XO1_PM
+ 	depends on INPUT=y
  	select POWER_SUPPLY
  	select GPIO_CS5535
  	select MFD_CORE