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

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-x86_64/alternative.h |    3 ---
 1 file changed, 3 deletions(-)

diff -puN include/asm-x86_64/alternative.h~git-newsetup-fixup include/asm-x86_64/alternative.h
--- a/include/asm-x86_64/alternative.h~git-newsetup-fixup
+++ a/include/asm-x86_64/alternative.h
@@ -138,7 +138,6 @@ static inline void alternatives_smp_swit
 		      "663:\n\t" newinstr "\n664:\n"   /* replacement */ \
 		      ".previous" : output : [feat] "i" (feature), ##input)
 
-<<<<<<< HEAD/include/asm-x86_64/alternative.h
 /*
  * use this macro(s) if you need more than one output parameter
  * in alternative_io
@@ -178,8 +177,6 @@ static inline void alternatives_smp_swit
 #define LOCK_PREFIX ""
 #endif
 
-=======
->>>>>>> /include/asm-x86_64/alternative.h
 struct paravirt_patch;
 #ifdef CONFIG_PARAVIRT
 void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end);
_