diff for duplicates of <20150728014946.GY12927@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 1c62cd9..9732bc1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -36,11 +36,11 @@ On Wed, Jul 15, 2015 at 03:40:11PM +0800, Alison Wang wrote:
 >  			status = "disabled";
 >  		};
 >  
-> +		ftm0: ftm0 at 29d0000 {
+> +		ftm0: ftm0@29d0000 {
 
 Is the '0' in the node name is an instance number?  If so, please drop
 it from node name.
-		ftm0: ftm at 29d0000 {
+		ftm0: ftm@29d0000 {
 
 > +			compatible = "fsl,ftm-alarm";
 
@@ -54,7 +54,7 @@ Shawn
 > +			status = "disabled";
 > +		};
 > +
->  		wdog0: watchdog at 2ad0000 {
+>  		wdog0: watchdog@2ad0000 {
 >  			compatible = "fsl,imx21-wdt";
 >  			reg = <0x0 0x2ad0000 0x0 0x10000>;
 > -- 
@@ -63,6 +63,6 @@ Shawn
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 >
diff --git a/a/content_digest b/N1/content_digest
index 959ed25..e530c49 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,13 @@
  "ref\01436946011-30113-1-git-send-email-b18965@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2] ARM: dts: ls1021a: add wakeup device ftm0 node for ls1021a\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v2] ARM: dts: ls1021a: add wakeup device ftm0 node for ls1021a\0"
  "Date\0Tue, 28 Jul 2015 09:49:46 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alison Wang <b18965@freescale.com>\0"
+ "Cc\0shawn.guo@linaro.org"
+  linux-arm-kernel@lists.infradead.org
+  linux-kernel@vger.kernel.org
+  Wang Dongsheng <dongsheng.wang@freescale.com>
+ " Alison Wang <alison.wang@freescale.com>\0"
  "\00:1\0"
  "b\0"
  "On Wed, Jul 15, 2015 at 03:40:11PM +0800, Alison Wang wrote:\n"
@@ -43,11 +48,11 @@
  ">  \t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tftm0: ftm0 at 29d0000 {\n"
+ "> +\t\tftm0: ftm0@29d0000 {\n"
  "\n"
  "Is the '0' in the node name is an instance number?  If so, please drop\n"
  "it from node name.\n"
- "\t\tftm0: ftm at 29d0000 {\n"
+ "\t\tftm0: ftm@29d0000 {\n"
  "\n"
  "> +\t\t\tcompatible = \"fsl,ftm-alarm\";\n"
  "\n"
@@ -61,7 +66,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\twdog0: watchdog at 2ad0000 {\n"
+ ">  \t\twdog0: watchdog@2ad0000 {\n"
  ">  \t\t\tcompatible = \"fsl,imx21-wdt\";\n"
  ">  \t\t\treg = <0x0 0x2ad0000 0x0 0x10000>;\n"
  "> -- \n"
@@ -70,8 +75,8 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  >
 
-7cef34b20d14bb04c7239e95bb4fcc6f9e9421c36c345af83e82ee035cd5ebb7
+6bf5071d9d5ea3f9608b60d6a6ecd200bab92a6a8afdcf04eae19f6a91bd786c
