From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 12 Mar 2009 10:50:15 +0000 (+0100)
Subject: Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a98fe7f3425c6b4e90de16f8da63b0429a8fed08;p=linux-2.6-omap-h63xx.git

Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus' into x86/core
---

a98fe7f3425c6b4e90de16f8da63b0429a8fed08
diff --cc arch/x86/Kconfig
index 87717f3687d,03f0a3aa43b,87717f3687d,87717f3687d,bc2fbadff9f..7fcf8518268
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@ -1431,8 -1437,8 -1431,8 -1431,8 -1400,8 +1437,8 @@@@@@ config CRASH_DUM
     config KEXEC_JUMP
     	bool "kexec jump (EXPERIMENTAL)"
     	depends on EXPERIMENTAL
 -  -	depends on KEXEC && HIBERNATION && X86_32
    -	help
 +  +	depends on KEXEC && HIBERNATION
    +	---help---
     	  Jump between original kernel and kexeced kernel and invoke
     	  code in physical address mode via KEXEC