diff for duplicates of <20150727142816.GP12927@tiger>

diff --git a/a/1.txt b/N1/1.txt
index d8d32a7..689bf75 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -146,7 +146,7 @@ tbi-handle is undocumented.
 >  			reg = <0x0 0x2d24000 0x0 0x4000>;
 >  		};
 >  
-> +		enet0: ethernet at 2d10000 {
+> +		enet0: ethernet@2d10000 {
 > +			compatible = "fsl,etsec2";
 > +			device_type = "network";
 > +			#address-cells = <2>;
@@ -163,7 +163,7 @@ Shawn
 
 > +			ranges;
 > +
-> +			queue-group at 2d10000 {
+> +			queue-group@2d10000 {
 > +				#address-cells = <2>;
 > +				#size-cells = <2>;
 > +				reg = <0x0 0x2d10000 0x0 0x1000>;
@@ -172,7 +172,7 @@ Shawn
 > +					<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
 > +			};
 > +
-> +			queue-group at 2d14000  {
+> +			queue-group@2d14000  {
 > +				#address-cells = <2>;
 > +				#size-cells = <2>;
 > +				reg = <0x0 0x2d14000 0x0 0x1000>;
@@ -182,7 +182,7 @@ Shawn
 > +			};
 > +		};
 > +
-> +		enet1: ethernet at 2d50000 {
+> +		enet1: ethernet@2d50000 {
 > +			compatible = "fsl,etsec2";
 > +			device_type = "network";
 > +			#address-cells = <2>;
@@ -192,7 +192,7 @@ Shawn
 > +			local-mac-address = [ 00 00 00 00 00 00 ];
 > +			ranges;
 > +
-> +			queue-group at 2d50000  {
+> +			queue-group@2d50000  {
 > +				#address-cells = <2>;
 > +				#size-cells = <2>;
 > +				reg = <0x0 0x2d50000 0x0 0x1000>;
@@ -201,7 +201,7 @@ Shawn
 > +					<GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
 > +			};
 > +
-> +			queue-group at 2d54000  {
+> +			queue-group@2d54000  {
 > +				#address-cells = <2>;
 > +				#size-cells = <2>;
 > +				reg = <0x0 0x2d54000 0x0 0x1000>;
@@ -211,7 +211,7 @@ Shawn
 > +			};
 > +		};
 > +
-> +		enet2: ethernet at 2d90000 {
+> +		enet2: ethernet@2d90000 {
 > +			compatible = "fsl,etsec2";
 > +			device_type = "network";
 > +			#address-cells = <2>;
@@ -221,7 +221,7 @@ Shawn
 > +			local-mac-address = [ 00 00 00 00 00 00 ];
 > +			ranges;
 > +
-> +			queue-group at 2d90000  {
+> +			queue-group@2d90000  {
 > +				#address-cells = <2>;
 > +				#size-cells = <2>;
 > +				reg = <0x0 0x2d90000 0x0 0x1000>;
@@ -230,7 +230,7 @@ Shawn
 > +					<GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
 > +			};
 > +
-> +			queue-group at 2d94000  {
+> +			queue-group@2d94000  {
 > +				#address-cells = <2>;
 > +				#size-cells = <2>;
 > +				reg = <0x0 0x2d94000 0x0 0x1000>;
@@ -240,7 +240,7 @@ Shawn
 > +			};
 > +		};
 > +
->  		usb at 8600000 {
+>  		usb@8600000 {
 >  			compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr";
 >  			reg = <0x0 0x8600000 0x0 0x1000>;
 > -- 
@@ -249,6 +249,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 42f7bd1..ce8d531 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,14 @@
  "ref\020150713133138.GO23464@tiger\0"
  "ref\01436888777-29742-1-git-send-email-claudiu.manoil@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2] dts: ls1021a: Add dts nodes for eTSEC0, eTSEC1 and eTSEC2\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v2] dts: ls1021a: Add dts nodes for eTSEC0, eTSEC1 and eTSEC2\0"
  "Date\0Mon, 27 Jul 2015 22:28:16 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Claudiu Manoil <claudiu.manoil@freescale.com>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-arm-kernel@lists.infradead.org
+  linux-kernel@vger.kernel.org
+  shawn.guo@linaro.org
+ " Alison Wang <alison.wang@freescale.com>\0"
  "\00:1\0"
  "b\0"
  "On Tue, Jul 14, 2015 at 06:46:17PM +0300, Claudiu Manoil wrote:\n"
@@ -154,7 +159,7 @@
  ">  \t\t\treg = <0x0 0x2d24000 0x0 0x4000>;\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tenet0: ethernet at 2d10000 {\n"
+ "> +\t\tenet0: ethernet@2d10000 {\n"
  "> +\t\t\tcompatible = \"fsl,etsec2\";\n"
  "> +\t\t\tdevice_type = \"network\";\n"
  "> +\t\t\t#address-cells = <2>;\n"
@@ -171,7 +176,7 @@
  "\n"
  "> +\t\t\tranges;\n"
  "> +\n"
- "> +\t\t\tqueue-group at 2d10000 {\n"
+ "> +\t\t\tqueue-group@2d10000 {\n"
  "> +\t\t\t\t#address-cells = <2>;\n"
  "> +\t\t\t\t#size-cells = <2>;\n"
  "> +\t\t\t\treg = <0x0 0x2d10000 0x0 0x1000>;\n"
@@ -180,7 +185,7 @@
  "> +\t\t\t\t\t<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqueue-group at 2d14000  {\n"
+ "> +\t\t\tqueue-group@2d14000  {\n"
  "> +\t\t\t\t#address-cells = <2>;\n"
  "> +\t\t\t\t#size-cells = <2>;\n"
  "> +\t\t\t\treg = <0x0 0x2d14000 0x0 0x1000>;\n"
@@ -190,7 +195,7 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet1: ethernet at 2d50000 {\n"
+ "> +\t\tenet1: ethernet@2d50000 {\n"
  "> +\t\t\tcompatible = \"fsl,etsec2\";\n"
  "> +\t\t\tdevice_type = \"network\";\n"
  "> +\t\t\t#address-cells = <2>;\n"
@@ -200,7 +205,7 @@
  "> +\t\t\tlocal-mac-address = [ 00 00 00 00 00 00 ];\n"
  "> +\t\t\tranges;\n"
  "> +\n"
- "> +\t\t\tqueue-group at 2d50000  {\n"
+ "> +\t\t\tqueue-group@2d50000  {\n"
  "> +\t\t\t\t#address-cells = <2>;\n"
  "> +\t\t\t\t#size-cells = <2>;\n"
  "> +\t\t\t\treg = <0x0 0x2d50000 0x0 0x1000>;\n"
@@ -209,7 +214,7 @@
  "> +\t\t\t\t\t<GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqueue-group at 2d54000  {\n"
+ "> +\t\t\tqueue-group@2d54000  {\n"
  "> +\t\t\t\t#address-cells = <2>;\n"
  "> +\t\t\t\t#size-cells = <2>;\n"
  "> +\t\t\t\treg = <0x0 0x2d54000 0x0 0x1000>;\n"
@@ -219,7 +224,7 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet2: ethernet at 2d90000 {\n"
+ "> +\t\tenet2: ethernet@2d90000 {\n"
  "> +\t\t\tcompatible = \"fsl,etsec2\";\n"
  "> +\t\t\tdevice_type = \"network\";\n"
  "> +\t\t\t#address-cells = <2>;\n"
@@ -229,7 +234,7 @@
  "> +\t\t\tlocal-mac-address = [ 00 00 00 00 00 00 ];\n"
  "> +\t\t\tranges;\n"
  "> +\n"
- "> +\t\t\tqueue-group at 2d90000  {\n"
+ "> +\t\t\tqueue-group@2d90000  {\n"
  "> +\t\t\t\t#address-cells = <2>;\n"
  "> +\t\t\t\t#size-cells = <2>;\n"
  "> +\t\t\t\treg = <0x0 0x2d90000 0x0 0x1000>;\n"
@@ -238,7 +243,7 @@
  "> +\t\t\t\t\t<GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqueue-group at 2d94000  {\n"
+ "> +\t\t\tqueue-group@2d94000  {\n"
  "> +\t\t\t\t#address-cells = <2>;\n"
  "> +\t\t\t\t#size-cells = <2>;\n"
  "> +\t\t\t\treg = <0x0 0x2d94000 0x0 0x1000>;\n"
@@ -248,7 +253,7 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tusb at 8600000 {\n"
+ ">  \t\tusb@8600000 {\n"
  ">  \t\t\tcompatible = \"fsl-usb2-dr-v2.5\", \"fsl-usb2-dr\";\n"
  ">  \t\t\treg = <0x0 0x8600000 0x0 0x1000>;\n"
  "> -- \n"
@@ -257,8 +262,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"
  >
 
-d7b356e4d58e951ed70db376a9b4a782785c2bf6af6cd334a2c33d413b38a91e
+2d26e5f4b1c096e75ce93826036000e540f742bd7cc5b6cc499394745bd48de7
