]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sparc64: Fix up merge thinko.
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 02:09:19 +0000 (19:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 02:09:19 +0000 (19:09 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/mm/init_64.c

index cdc9f145e3c35529a346dac9159437bdf887e795..98ac8e80adae07a841ade82c0ec3d5896f3aa3dd 100644 (file)
@@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
                do_flush_tlb_kernel_range(start, end);
        }
 }
->>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d