diff for duplicates of <5730AF76.3000608@mvista.com>

diff --git a/a/1.txt b/N1/1.txt
index 28cc126..9c6ff46 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -62,9 +62,3 @@ Is this what you are suggesting?
 >>>>>   			end
 >>>>>   			set $stackp += 4
 >>>>>   		end
-
-
-_______________________________________________
-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 6af642e..a5ef45a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,11 +8,11 @@
  "Date\0Mon, 9 May 2016 10:40:38 -0500\0"
  "To\0Baoquan He <bhe@redhat.com>"
  " Corey Minyard <minyard@acm.org>\0"
- "Cc\0Haren Myneni <hbabu@us.ibm.com>"
-  dyoung@redhat.com
-  kexec@lists.infradead.org
+ "Cc\0kexec@lists.infradead.org"
   linux-kernel@vger.kernel.org
- " Vivek Goyal <vgoyal@redhat.com>\0"
+  Vivek Goyal <vgoyal@redhat.com>
+  Haren Myneni <hbabu@us.ibm.com>
+ " dyoung@redhat.com\0"
  "\00:1\0"
  "b\0"
  "On 05/09/2016 09:29 AM, Baoquan He wrote:\n"
@@ -78,12 +78,6 @@
  ">>>>> @@ -31,12 +31,12 @@ define bttnobp\n"
  ">>>>>   \t\t\tend\n"
  ">>>>>   \t\t\tset $stackp += 4\n"
- ">>>>>   \t\tend\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ ">>>>>   \t\tend"
 
-b664a3207389f7bf8141dbd34d70d3c48d9880f5add045124888803f7091ce83
+f510ab9e70f63bea70f3997edc09f09836a9210dc37a17e21b228242ca9fffc9
