diff for duplicates of <20160330125551.GI28207@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 5ec1741..2df0a4c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,7 +32,7 @@ Shawn
 > +			clocks = <&clockgen 1 0>;
 >  		};
 >  
->  		cpu at f01 {
+>  		cpu@f01 {
 >  			compatible = "arm,cortex-a7";
 >  			device_type = "cpu";
 >  			reg = <0xf01>;
@@ -74,7 +74,7 @@ Shawn
 > @@ -200,41 +214,10 @@
 >  		};
 >  
->  		clockgen: clocking at 1ee1000 {
+>  		clockgen: clocking@1ee1000 {
 > -			#address-cells = <1>;
 > -			#size-cells = <1>;
 > -			ranges = <0x0 0x0 0x1ee1000 0x10000>;
@@ -85,7 +85,7 @@ Shawn
 > -				clock-output-names = "sysclk";
 > -			};
 > -
-> -			cga_pll1: pll at 800 {
+> -			cga_pll1: pll@800 {
 > -				compatible = "fsl,qoriq-core-pll-2.0";
 > -				#clock-cells = <1>;
 > -				reg = <0x800 0x10>;
@@ -94,7 +94,7 @@ Shawn
 > -						     "cga-pll1-div4";
 > -			};
 > -
-> -			platform_clk: pll at c00 {
+> -			platform_clk: pll@c00 {
 > -				compatible = "fsl,qoriq-core-pll-2.0";
 > -				#clock-cells = <1>;
 > -				reg = <0xc00 0x10>;
@@ -102,7 +102,7 @@ Shawn
 > -				clock-output-names = "platform-clk", "platform-clk-div2";
 > -			};
 > -
-> -			cluster1_clk: clk0c0 at 0 {
+> -			cluster1_clk: clk0c0@0 {
 > -				compatible = "fsl,qoriq-core-mux-2.0";
 > -				#clock-cells = <0>;
 > -				reg = <0x0 0x10>;
@@ -116,7 +116,7 @@ Shawn
 > +			clocks = <&sysclk>;
 >  		};
 >  
->  		dspi0: dspi at 2100000 {
+>  		dspi0: dspi@2100000 {
 > @@ -244,7 +227,7 @@
 >  			reg = <0x0 0x2100000 0x0 0x10000>;
 >  			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -257,7 +257,7 @@ Shawn
 > +				 <&clockgen 4 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>;
@@ -272,6 +272,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 0c9176a..9c4c690 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,12 @@
  "ref\01456899082-29762-1-git-send-email-b18965@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH] ARM: dts: ls102xa: Use new clock binding\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH] ARM: dts: ls102xa: Use new clock binding\0"
  "Date\0Wed, 30 Mar 2016 20:55:51 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alison Wang <b18965@freescale.com>\0"
+ "Cc\0scott.wood@nxp.com"
+  linux-arm-kernel@lists.infradead.org
+  linux-kernel@vger.kernel.org
+ " Alison Wang <alison.wang@nxp.com>\0"
  "\00:1\0"
  "b\0"
  "On Wed, Mar 02, 2016 at 02:11:22PM +0800, Alison Wang wrote:\n"
@@ -39,7 +43,7 @@
  "> +\t\t\tclocks = <&clockgen 1 0>;\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\tcpu at f01 {\n"
+ ">  \t\tcpu@f01 {\n"
  ">  \t\t\tcompatible = \"arm,cortex-a7\";\n"
  ">  \t\t\tdevice_type = \"cpu\";\n"
  ">  \t\t\treg = <0xf01>;\n"
@@ -81,7 +85,7 @@
  "> @@ -200,41 +214,10 @@\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\tclockgen: clocking at 1ee1000 {\n"
+ ">  \t\tclockgen: clocking@1ee1000 {\n"
  "> -\t\t\t#address-cells = <1>;\n"
  "> -\t\t\t#size-cells = <1>;\n"
  "> -\t\t\tranges = <0x0 0x0 0x1ee1000 0x10000>;\n"
@@ -92,7 +96,7 @@
  "> -\t\t\t\tclock-output-names = \"sysclk\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tcga_pll1: pll at 800 {\n"
+ "> -\t\t\tcga_pll1: pll@800 {\n"
  "> -\t\t\t\tcompatible = \"fsl,qoriq-core-pll-2.0\";\n"
  "> -\t\t\t\t#clock-cells = <1>;\n"
  "> -\t\t\t\treg = <0x800 0x10>;\n"
@@ -101,7 +105,7 @@
  "> -\t\t\t\t\t\t     \"cga-pll1-div4\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tplatform_clk: pll at c00 {\n"
+ "> -\t\t\tplatform_clk: pll@c00 {\n"
  "> -\t\t\t\tcompatible = \"fsl,qoriq-core-pll-2.0\";\n"
  "> -\t\t\t\t#clock-cells = <1>;\n"
  "> -\t\t\t\treg = <0xc00 0x10>;\n"
@@ -109,7 +113,7 @@
  "> -\t\t\t\tclock-output-names = \"platform-clk\", \"platform-clk-div2\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tcluster1_clk: clk0c0 at 0 {\n"
+ "> -\t\t\tcluster1_clk: clk0c0@0 {\n"
  "> -\t\t\t\tcompatible = \"fsl,qoriq-core-mux-2.0\";\n"
  "> -\t\t\t\t#clock-cells = <0>;\n"
  "> -\t\t\t\treg = <0x0 0x10>;\n"
@@ -123,7 +127,7 @@
  "> +\t\t\tclocks = <&sysclk>;\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\tdspi0: dspi at 2100000 {\n"
+ ">  \t\tdspi0: dspi@2100000 {\n"
  "> @@ -244,7 +227,7 @@\n"
  ">  \t\t\treg = <0x0 0x2100000 0x0 0x10000>;\n"
  ">  \t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -264,7 +268,7 @@
  "> +\t\t\t\t <&clockgen 4 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"
@@ -279,8 +283,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"
  >
 
-4e38712eef6d1866e0c53409164c0ac0eff5cacfeae9d93b08ef801f33454f29
+5056024f7487691b6a6a1b117096c612be25e16ddff425dd2327f510274f40f0
