sparc64: Fix up merge thinko.

Signed-off-by: David S. Miller <davem@davemloft.net>

sparc64: Fix up merge thinko.
Signed-off-by: David S. Miller <davem@davemloft.net>
5b6ff9df · David S. Miller · e9011d08 · 5b6ff9df
Commit 5b6ff9df authored Aug 05, 2014 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

arch/sparc/mm/init_64.c arch/sparc/mm/init_64.c +0 -1

No files found.
--- 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