diff for duplicates of <20150930054028.GA16362@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 3b2a824..203cbf8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,8 +7,8 @@ On Thu, Aug 27, 2015 at 02:13:46PM +0800, Jianwei Wang wrote:
 > Signed-off-by: Jianwei Wang <jianwei.wang.chn@gmail.com>
 
 MAINTAINERS file has been updated for a couple of release cycles.
-Please stop using shawn.guo at linaro.org, and resend to
-shawnguo at kernel.org instead.
+Please stop using shawn.guo@linaro.org, and resend to
+shawnguo@kernel.org instead.
 
 Shawn
 
@@ -24,7 +24,7 @@ Shawn
 >  				 <&platform_clk 1>;
 >  		};
 >  
-> +		dcu: dcu at 2ce0000 {
+> +		dcu: dcu@2ce0000 {
 > +			compatible = "fsl,ls1021a-dcu";
 > +			reg = <0x0 0x2ce0000 0x0 0x10000>;
 > +			interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
@@ -34,7 +34,7 @@ Shawn
 > +			status = "disabled";
 > +		};
 > +
->  		mdio0: mdio at 2d24000 {
+>  		mdio0: mdio@2d24000 {
 >  			compatible = "gianfar";
 >  			device_type = "mdio";
 > -- 
@@ -43,6 +43,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 17989c6..f4a89da 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,14 @@
  "ref\01440656027-8542-1-git-send-email-jianwei.wang.chn@gmail.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v15 1/2] arm:dts:ls1021a: Add DCU dts node\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v15 1/2] arm:dts:ls1021a: Add DCU dts node\0"
  "Date\0Wed, 30 Sep 2015 13:40:28 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Jianwei Wang <jianwei.wang.chn@gmail.com>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  shawn.guo@linaro.org
+  Xiubo Li <lixiubo@cmss.chinamobile.com>
+  Alison Wang <b18965@freescale.com>
+  linux-kernel@vger.kernel.org
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Aug 27, 2015 at 02:13:46PM +0800, Jianwei Wang wrote:\n"
@@ -14,8 +20,8 @@
  "> Signed-off-by: Jianwei Wang <jianwei.wang.chn@gmail.com>\n"
  "\n"
  "MAINTAINERS file has been updated for a couple of release cycles.\n"
- "Please stop using shawn.guo at linaro.org, and resend to\n"
- "shawnguo at kernel.org instead.\n"
+ "Please stop using shawn.guo@linaro.org, and resend to\n"
+ "shawnguo@kernel.org instead.\n"
  "\n"
  "Shawn\n"
  "\n"
@@ -31,7 +37,7 @@
  ">  \t\t\t\t <&platform_clk 1>;\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tdcu: dcu at 2ce0000 {\n"
+ "> +\t\tdcu: dcu@2ce0000 {\n"
  "> +\t\t\tcompatible = \"fsl,ls1021a-dcu\";\n"
  "> +\t\t\treg = <0x0 0x2ce0000 0x0 0x10000>;\n"
  "> +\t\t\tinterrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -41,7 +47,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tmdio0: mdio at 2d24000 {\n"
+ ">  \t\tmdio0: mdio@2d24000 {\n"
  ">  \t\t\tcompatible = \"gianfar\";\n"
  ">  \t\t\tdevice_type = \"mdio\";\n"
  "> -- \n"
@@ -50,8 +56,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"
  >
 
-db9aa814ebf009388fd12be950101245e6c658394fb2dcae5dec701396edeb8a
+9bac7d39744dfc18f149fcc6d2e2a722f61137258a4a26b498b8ad941e0b2e8d
