diff for duplicates of <20160202074907.GK8307@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 00eae65..03a1f80 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,7 +28,7 @@ Please send me dts patch only after the driver part gets applied.
 >  			status = "disabled";
 >  		};
 >  
-> +		qspi: quadspi at 1550000 {
+> +		qspi: quadspi@1550000 {
 > +			compatible = "fsl,ls1021a-qspi";
 > +			#address-cells = <1>;
 > +			#size-cells = <0>;
@@ -49,7 +49,7 @@ Shawn
 > +			status = "disabled";
 > +		};
 > +
->  		i2c0: i2c at 2180000 {
+>  		i2c0: i2c@2180000 {
 >  			compatible = "fsl,vf610-i2c";
 >  			#address-cells = <1>;
 > -- 
@@ -58,6 +58,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 da20061..500e2d9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,14 @@
  "ref\01453970006-46509-1-git-send-email-yao.yuan@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH] dts/ls1021a: add the DTS for QSPI support\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH] dts/ls1021a: add the DTS for QSPI support\0"
  "Date\0Tue, 2 Feb 2016 15:49:07 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Yuan Yao <yao.yuan@freescale.com>\0"
+ "Cc\0mark.rutland@arm.com"
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  robh+dt@kernel.org
+  Yuan Yao <yao.yuan@nxp.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Jan 28, 2016 at 04:33:26PM +0800, Yuan Yao wrote:\n"
@@ -35,7 +41,7 @@
  ">  \t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tqspi: quadspi at 1550000 {\n"
+ "> +\t\tqspi: quadspi@1550000 {\n"
  "> +\t\t\tcompatible = \"fsl,ls1021a-qspi\";\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <0>;\n"
@@ -56,7 +62,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\ti2c0: i2c at 2180000 {\n"
+ ">  \t\ti2c0: i2c@2180000 {\n"
  ">  \t\t\tcompatible = \"fsl,vf610-i2c\";\n"
  ">  \t\t\t#address-cells = <1>;\n"
  "> -- \n"
@@ -65,8 +71,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"
  >
 
-ecdd83989c48e81aa02c57add4f3efc841aa8af37d4babeb28253d797c2f1024
+9a058d99a930851497d2b978cbe0fca1fc97911cb1f00a099e5d64885e6d7318
