sparc64: Fix up merge thinko.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-05 19:09:19 -07:00 · 2014-08-05 19:09:19 -07:00 · 5b6ff9df05
parent e9011d0866
commit 5b6ff9df05
1 changed files with 0 additions and 1 deletions
--- 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