diff for duplicates of <20150720084558.600110871@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index 2c78de8..cf22b7b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2258,10 +2258,3 @@ Signed-off-by: Dave Young <dyoung@redhat.com>
 +static inline void kimage_file_post_load_cleanup(struct kimage *image) { }
 +#endif /* CONFIG_KEXEC_FILE */
 +#endif /* LINUX_KEXEC_INTERNAL_H */
-
-
-
-_______________________________________________
-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 1901d41..9a2182a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,15 +4,15 @@
  "Date\0Mon, 20 Jul 2015 16:37:14 +0800\0"
  "To\0linux-kernel@vger.kernel.org"
  " kexec@lists.infradead.org\0"
- "Cc\0jwboyer@fedoraproject.org"
-  tytso@mit.edu
+ "Cc\0dyoung@redhat.com"
+  ebiederm@xmission.com
+  vgoyal@redhat.com
   ptesarik@suse.cz
+  tytso@mit.edu
+  jwboyer@fedoraproject.org
   dhowells@redhat.com
-  geert@linux-m68k.org
-  ebiederm@xmission.com
   akpm@linux-foundation.org
-  dyoung@redhat.com
- " vgoyal@redhat.com\0"
+ " geert@linux-m68k.org\0"
  "\00:1\0"
  "fn\00001-kexec-split-kexec_file-syscall-code-to-kexec_file.c.patch\0"
  "b\0"
@@ -2275,13 +2275,6 @@
  "+#else /* CONFIG_KEXEC_FILE */\n"
  "+static inline void kimage_file_post_load_cleanup(struct kimage *image) { }\n"
  "+#endif /* CONFIG_KEXEC_FILE */\n"
- "+#endif /* LINUX_KEXEC_INTERNAL_H */\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ +#endif /* LINUX_KEXEC_INTERNAL_H */
 
-bc148df2881248c2f6b25d980689adad65c0a9cb2e10581922951ae1d5a2f0f5
+590a54cc637690a31de9a1e01910ff2c1727a1a7287941ae92e5f137b408721c
