Remove a merge conflict leftover in arch/x86/mm/iomap_32.c

Signed-off-by: Marc A. Dahlhaus <mad@xxxxxx>

--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -60,15 +60,7 @@ iomap_atomic_prot_pfn(unsigned long pfn,
 	if (!pat_enabled && pgprot_val(prot) == pgprot_val(PAGE_KERNEL_WC))
 		prot = PAGE_KERNEL_UC_MINUS;
 
-<<<<<<< HEAD:arch/x86/mm/iomap_32.c
-	idx = type + KM_TYPE_NR*smp_processor_id();
-	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-	set_pte(kmap_pte-idx, pfn_pte(pfn, prot));
-
-	return (void*) vaddr;
-=======
 	return kmap_atomic_prot_pfn(pfn, type, prot);
->>>>>>> tip/master:arch/x86/mm/iomap_32.c
 }
 EXPORT_SYMBOL_GPL(iomap_atomic_prot_pfn);