diff for duplicates of <20140423224946.GA12738@kwain>

diff --git a/a/1.txt b/N1/1.txt
index e3a7383..00fa9fb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,28 +17,28 @@ On Wed, Apr 23, 2014 at 04:01:07PM +0200, Alexandre Belloni wrote:
 >  			reg = <0xdd0170 0x8>;
 >  		};
 >  
-> -		syspll: syspll at ea0030 {
+> -		syspll: syspll@ea0030 {
 > -			compatible = "marvell,berlin2q-pll";
 > -			clocks = <&smclk>;
 > -			#clock-cells = <0>;
 > -			reg = <0xea0030 0x8>;
 > -		};
 > -
->  		apb at e80000 {
+>  		apb@e80000 {
 >  			compatible = "simple-bus";
 >  			#address-cells = <1>;
 > @@ -191,6 +184,27 @@
 >  			};
 >  		};
 >  
-> +		syspll: syspll at ea0030 {
+> +		syspll: syspll@ea0030 {
 > +			compatible = "marvell,berlin2q-pll";
 > +			clocks = <&smclk>;
 > +			#clock-cells = <0>;
 > +			reg = <0xea0030 0x8>;
 > +		};
 > +
-> +		sdio0xinclk: sdio0xinclk at ea0158 {
+> +		sdio0xinclk: sdio0xinclk@ea0158 {
 > +			compatible = "marvell,berlin-clk";
 > +			clocks = <&syspll>;
 > +			#clock-cells = <0>;
@@ -53,7 +53,7 @@ hex values elsewhere too.
 
 > +		};
 > +
-> +		sdio1xinclk: sdio1xinclk at ea015c {
+> +		sdio1xinclk: sdio1xinclk@ea015c {
 > +			compatible = "marvell,berlin-clk";
 > +			clocks = <&syspll>;
 > +			#clock-cells = <0>;
@@ -67,7 +67,7 @@ Antoine
 
 > +		};
 > +
->  		apb at fc0000 {
+>  		apb@fc0000 {
 >  			compatible = "simple-bus";
 >  			#address-cells = <1>;
 > -- 
@@ -76,10 +76,10 @@ Antoine
 > 
 > _______________________________________________
 > 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
 
 -- 
-Antoine T?nart, Free Electrons
+Antoine Ténart, Free Electrons
 Embedded Linux, Kernel and Android engineering
 http://free-electrons.com
diff --git a/a/content_digest b/N1/content_digest
index 3028a0c..35043e1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,13 @@
  "ref\01398261667-12621-1-git-send-email-alexandre.belloni@free-electrons.com\0"
  "ref\01398261667-12621-6-git-send-email-alexandre.belloni@free-electrons.com\0"
- "From\0antoine.tenart@free-electrons.com (Antoine T\303\251nart)\0"
- "Subject\0[PATCH 5/5] ARM: berlin/dt: add sdio clocks to BG2Q\0"
+ "From\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0"
+ "Subject\0Re: [PATCH 5/5] ARM: berlin/dt: add sdio clocks to BG2Q\0"
  "Date\0Thu, 24 Apr 2014 00:49:46 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0"
+ "Cc\0Mike Turquette <mturquette@linaro.org>"
+  linux-kernel@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+ " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
  "\00:1\0"
  "b\0"
  "Alexandre,\n"
@@ -25,28 +29,28 @@
  ">  \t\t\treg = <0xdd0170 0x8>;\n"
  ">  \t\t};\n"
  ">  \n"
- "> -\t\tsyspll: syspll at ea0030 {\n"
+ "> -\t\tsyspll: syspll@ea0030 {\n"
  "> -\t\t\tcompatible = \"marvell,berlin2q-pll\";\n"
  "> -\t\t\tclocks = <&smclk>;\n"
  "> -\t\t\t#clock-cells = <0>;\n"
  "> -\t\t\treg = <0xea0030 0x8>;\n"
  "> -\t\t};\n"
  "> -\n"
- ">  \t\tapb at e80000 {\n"
+ ">  \t\tapb@e80000 {\n"
  ">  \t\t\tcompatible = \"simple-bus\";\n"
  ">  \t\t\t#address-cells = <1>;\n"
  "> @@ -191,6 +184,27 @@\n"
  ">  \t\t\t};\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tsyspll: syspll at ea0030 {\n"
+ "> +\t\tsyspll: syspll@ea0030 {\n"
  "> +\t\t\tcompatible = \"marvell,berlin2q-pll\";\n"
  "> +\t\t\tclocks = <&smclk>;\n"
  "> +\t\t\t#clock-cells = <0>;\n"
  "> +\t\t\treg = <0xea0030 0x8>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tsdio0xinclk: sdio0xinclk at ea0158 {\n"
+ "> +\t\tsdio0xinclk: sdio0xinclk@ea0158 {\n"
  "> +\t\t\tcompatible = \"marvell,berlin-clk\";\n"
  "> +\t\t\tclocks = <&syspll>;\n"
  "> +\t\t\t#clock-cells = <0>;\n"
@@ -61,7 +65,7 @@
  "\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tsdio1xinclk: sdio1xinclk at ea015c {\n"
+ "> +\t\tsdio1xinclk: sdio1xinclk@ea015c {\n"
  "> +\t\t\tcompatible = \"marvell,berlin-clk\";\n"
  "> +\t\t\tclocks = <&syspll>;\n"
  "> +\t\t\t#clock-cells = <0>;\n"
@@ -75,7 +79,7 @@
  "\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tapb at fc0000 {\n"
+ ">  \t\tapb@fc0000 {\n"
  ">  \t\t\tcompatible = \"simple-bus\";\n"
  ">  \t\t\t#address-cells = <1>;\n"
  "> -- \n"
@@ -84,12 +88,12 @@
  "> \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"
  "\n"
  "-- \n"
- "Antoine T?nart, Free Electrons\n"
+ "Antoine T\303\251nart, Free Electrons\n"
  "Embedded Linux, Kernel and Android engineering\n"
  http://free-electrons.com
 
-e0cf9213fa2765ccfccee0deaaec85b1fb0ffc0acb415604adf559273418aaf0
+010d3c2375a222b06c59c647fc315296b719b994dc760101520dcb7b3806527f
