diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index cdc9f145e3c35529a346dac9159437bdf887e795..98ac8e80adae07a841ade82c0ec3d5896f3aa3dd 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
 		do_flush_tlb_kernel_range(start, end);
 	}
 }
->>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d