Commit 5b6ff9df authored by David S. Miller's avatar David S. Miller

sparc64: Fix up merge thinko.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9011d08
...@@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) ...@@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
do_flush_tlb_kernel_range(start, end); do_flush_tlb_kernel_range(start, end);
} }
} }
>>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment