diff for duplicates of <20110704170959.919268183@linux.vnet.ibm.com>

diff --git a/a/1.txt b/N1/1.txt
index a37a4c0..7192f2d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2490,10 +2490,3 @@ Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 +			       (void *) mem_start + mem_offs, size);
  	if (rc)
  		goto fail;
- 
-
-
-_______________________________________________
-kexec mailing list
-kexec@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/kexec
diff --git a/a/content_digest b/N1/content_digest
index 1f3a5aa..4fddb77 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,12 +7,12 @@
   hbabu@us.ibm.com
  " mahesh@linux.vnet.ibm.com\0"
  "Cc\0oomichi@mxs.nes.nec.co.jp"
-  linux-s390@vger.kernel.org
-  kexec@lists.infradead.org
+  horms@verge.net.au
+  schwidefsky@de.ibm.com
   heiko.carstens@de.ibm.com
+  kexec@lists.infradead.org
   linux-kernel@vger.kernel.org
-  horms@verge.net.au
- " schwidefsky@de.ibm.com\0"
+ " linux-s390@vger.kernel.org\0"
  "\00:1\0"
  "fn\008-s390-kdump-arch.patch\0"
  "b\0"
@@ -2507,13 +2507,6 @@
  "+\trc = copy_to_user_real(buf + hdr_count + mem_offs,\n"
  "+\t\t\t       (void *) mem_start + mem_offs, size);\n"
  " \tif (rc)\n"
- " \t\tgoto fail;\n"
- " \n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ " \t\tgoto fail;"
 
-d69ad51756167260ef3472ce07e030399cb050f1bbd43668abac4e611ad6f44d
+38b7573b7c6d0accf99f3d046713139f956d2037a5d82b0bd663f163a73c0a56
