From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/jazz_esp.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN drivers/scsi/jazz_esp.c~git-scsi-misc-fixup drivers/scsi/jazz_esp.c
--- a/drivers/scsi/jazz_esp.c~git-scsi-misc-fixup
+++ a/drivers/scsi/jazz_esp.c
@@ -1,10 +1,6 @@
 /* jazz_esp.c: ESP front-end for MIPS JAZZ systems.
  *
-<<<<<<< HEAD/drivers/scsi/jazz_esp.c
- * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende)
-=======
  * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende)
->>>>>>> /drivers/scsi/jazz_esp.c
  */
 
 #include <linux/kernel.h>
_