diff for duplicates of <53299CA8.607@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index cbf4c61..80aa6e0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -94,13 +94,13 @@ http://marc.info/?l=linux-netdev&m=139167062725242&w=2
 > -	#size-cells = <1>;
 > -
 > -	compatible = "altr,socfpga-stmmac";
-> +gmac0: ethernet at ff700000 {
+> +gmac0: ethernet@ff700000 {
 > +	compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
 >   	altr,sysmgr-syscon = <&sysmgr 0x60>;
 >   	status = "disabled";
 > -	ranges;
 > -
-> -	gmac0: gmac0 at ff700000 {
+> -	gmac0: gmac0@ff700000 {
 > -		compatible = "snps,dwmac-3.70a", "snps,dwmac";
 > -		reg = <0xff700000 0x2000>;
 > -		interrupts = <0 115 4>;
@@ -127,12 +127,12 @@ http://marc.info/?l=linux-netdev&m=139167062725242&w=2
 > -			#size-cells = <1>;
 > -			compatible = "altr,socfpga-stmmac";
 > -			altr,sysmgr-syscon = <&sysmgr 0x60>;
-> +		gmac0: ethernet at ff700000 {
+> +		gmac0: ethernet@ff700000 {
 > +			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
 >   			status = "disabled";
 > -			ranges;
 > -
-> -			gmac0: gmac0 at ff700000 {
+> -			gmac0: gmac0@ff700000 {
 > -				compatible = "snps,dwmac-3.70a", "snps,dwmac";
 > -				reg = <0xff700000 0x2000>;
 > -				interrupts = <0 115 4>;
@@ -153,12 +153,12 @@ http://marc.info/?l=linux-netdev&m=139167062725242&w=2
 > -			#size-cells = <1>;
 > -			compatible = "altr,socfpga-stmmac";
 > -			altr,sysmgr-syscon = <&sysmgr 0x60>;
-> +		gmac1: ethernet at ff702000 {
+> +		gmac1: ethernet@ff702000 {
 > +			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
 >   			status = "disabled";
 > -			ranges;
 > -
-> -			gmac1: gmac1 at ff702000 {
+> -			gmac1: gmac1@ff702000 {
 > -				device_type = "network";
 > -				compatible = "snps,dwmac-3.70a", "snps,dwmac";
 > -				reg = <0xff702000 0x2000>;
@@ -175,7 +175,7 @@ http://marc.info/?l=linux-netdev&m=139167062725242&w=2
 > +			clocks = <&emac1_clk>;
 >   		};
 >
->   		L2: l2-cache at fffef000 {
+>   		L2: l2-cache@fffef000 {
 > diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
 > index f2d7c70..f8d5112 100644
 > --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -398,6 +398,6 @@ Dinh
 >
 > _______________________________________________
 > 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 77e43f4..34b9ea6 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,17 @@
  "ref\0201403191333.01095.arnd@arndb.de\0"
- "From\0dinh.linux@gmail.com (Dinh Nguyen)\0"
- "Subject\0stmmac-socfpga breakage in arm-soc\0"
+ "From\0Dinh Nguyen <dinh.linux@gmail.com>\0"
+ "Subject\0Re: stmmac-socfpga breakage in arm-soc\0"
  "Date\0Wed, 19 Mar 2014 08:33:28 -0500\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Arnd Bergmann <arnd@arndb.de>"
+ " Dinh Nguyen <dinguyen@altera.com>\0"
+ "Cc\0Srinivas Kandagatla <srinivas.kandagatla@st.com>"
+  netdev@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  Hans de Goede <hdegoede@redhat.com>
+  arm@kernel.org
+  Giuseppe Cavallaro <peppe.cavallaro@st.com>
+  David S. Miller <davem@davemloft.net>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Arnd,\n"
@@ -101,13 +110,13 @@
  "> -\t#size-cells = <1>;\n"
  "> -\n"
  "> -\tcompatible = \"altr,socfpga-stmmac\";\n"
- "> +gmac0: ethernet at ff700000 {\n"
+ "> +gmac0: ethernet@ff700000 {\n"
  "> +\tcompatible = \"altr,socfpga-stmmac\", \"snps,dwmac-3.70a\", \"snps,dwmac\";\n"
  ">   \taltr,sysmgr-syscon = <&sysmgr 0x60>;\n"
  ">   \tstatus = \"disabled\";\n"
  "> -\tranges;\n"
  "> -\n"
- "> -\tgmac0: gmac0 at ff700000 {\n"
+ "> -\tgmac0: gmac0@ff700000 {\n"
  "> -\t\tcompatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n"
  "> -\t\treg = <0xff700000 0x2000>;\n"
  "> -\t\tinterrupts = <0 115 4>;\n"
@@ -134,12 +143,12 @@
  "> -\t\t\t#size-cells = <1>;\n"
  "> -\t\t\tcompatible = \"altr,socfpga-stmmac\";\n"
  "> -\t\t\taltr,sysmgr-syscon = <&sysmgr 0x60>;\n"
- "> +\t\tgmac0: ethernet at ff700000 {\n"
+ "> +\t\tgmac0: ethernet@ff700000 {\n"
  "> +\t\t\tcompatible = \"altr,socfpga-stmmac\", \"snps,dwmac-3.70a\", \"snps,dwmac\";\n"
  ">   \t\t\tstatus = \"disabled\";\n"
  "> -\t\t\tranges;\n"
  "> -\n"
- "> -\t\t\tgmac0: gmac0 at ff700000 {\n"
+ "> -\t\t\tgmac0: gmac0@ff700000 {\n"
  "> -\t\t\t\tcompatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n"
  "> -\t\t\t\treg = <0xff700000 0x2000>;\n"
  "> -\t\t\t\tinterrupts = <0 115 4>;\n"
@@ -160,12 +169,12 @@
  "> -\t\t\t#size-cells = <1>;\n"
  "> -\t\t\tcompatible = \"altr,socfpga-stmmac\";\n"
  "> -\t\t\taltr,sysmgr-syscon = <&sysmgr 0x60>;\n"
- "> +\t\tgmac1: ethernet at ff702000 {\n"
+ "> +\t\tgmac1: ethernet@ff702000 {\n"
  "> +\t\t\tcompatible = \"altr,socfpga-stmmac\", \"snps,dwmac-3.70a\", \"snps,dwmac\";\n"
  ">   \t\t\tstatus = \"disabled\";\n"
  "> -\t\t\tranges;\n"
  "> -\n"
- "> -\t\t\tgmac1: gmac1 at ff702000 {\n"
+ "> -\t\t\tgmac1: gmac1@ff702000 {\n"
  "> -\t\t\t\tdevice_type = \"network\";\n"
  "> -\t\t\t\tcompatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n"
  "> -\t\t\t\treg = <0xff702000 0x2000>;\n"
@@ -182,7 +191,7 @@
  "> +\t\t\tclocks = <&emac1_clk>;\n"
  ">   \t\t};\n"
  ">\n"
- ">   \t\tL2: l2-cache at fffef000 {\n"
+ ">   \t\tL2: l2-cache@fffef000 {\n"
  "> diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig\n"
  "> index f2d7c70..f8d5112 100644\n"
  "> --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig\n"
@@ -405,8 +414,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"
  >
 
-b6d8585426e628a1c71db643e66d0389936b174b1e4845825a9658111d9d62e8
+0471d885c2eb431530a3144f79986c6d91462ee7a6fe53755a43213800f57412
