From: David S. Miller <davem@davemloft.net>
Date: Wed, 6 Aug 2014 02:09:19 +0000 (-0700)
Subject: sparc64: Fix up merge thinko.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5b6ff9df056b69a3b65708bfb9923af41146c8c8;p=linux-beck.git

sparc64: Fix up merge thinko.

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

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index cdc9f145e3c3..98ac8e80adae 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