From: Andrew Morton <akpm@linux-foundation.org>

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/Kconfig |    4 ----
 1 file changed, 4 deletions(-)

diff -puN arch/x86/Kconfig~git-sched-git-rejects arch/x86/Kconfig
--- a/arch/x86/Kconfig~git-sched-git-rejects
+++ a/arch/x86/Kconfig
@@ -21,12 +21,8 @@ config X86
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
-<<<<<<< HEAD:arch/x86/Kconfig
 	select HAVE_KVM
-
-=======
 	select HAVE_FTRACE
->>>>>>> FETCH_HEAD:arch/x86/Kconfig
 
 config GENERIC_LOCKBREAK
 	def_bool n
_