sparc64: Fix up merge thinko. · 5b6ff9df05 - Gogs: Go Git Service GfA electronic

sparc64: Fix up merge thinko.

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

David S. Miller 11 years ago

parent

e9011d0866

commit

5b6ff9df05

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
arch/sparc/mm/init_64.c
							 
								View File
							
				@@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
			
				 		do_flush_tlb_kernel_range(start, end);
			
				 	}
			
				 }
			
				->>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d