diff for duplicates of <56BB2D79.6090402@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 5e4a3fc..9bb1b0d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -114,7 +114,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> @@ -201,11 +201,11 @@
 >>  		};
 >>  
->>  		pll6: clk@01c20028 {
+>>  		pll6: clk at 01c20028 {
 >> -			#clock-cells = <1>;
 >> +			#clock-cells = <0>;
 >>  			compatible = "allwinner,sun6i-a31-pll6-clk";
@@ -124,7 +124,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> +			clock-output-names = "pll6";
 >>  		};
 >>  
->>  		cpu: cpu@01c20050 {
+>>  		cpu: cpu at 01c20050 {
 >> @@ -235,7 +235,7 @@
 >>  			#clock-cells = <0>;
 >>  			compatible = "allwinner,sun6i-a31-ahb1-clk";
@@ -142,7 +142,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> +			assigned-clock-parents = <&pll6>;
 >>  		};
 >>  
->>  		ahb1_gates: clk@01c20060 {
+>>  		ahb1_gates: clk at 01c20060 {
 >> @@ -307,7 +307,7 @@
 >>  			#clock-cells = <0>;
 >>  			compatible = "allwinner,sun4i-a10-apb1-clk";
@@ -260,7 +260,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> @@ -129,11 +129,20 @@
 >>  		};
 >>  
->>  		pll6: clk@01c20028 {
+>>  		pll6: clk at 01c20028 {
 >> -			#clock-cells = <1>;
 >> +			#clock-cells = <0>;
 >>  			compatible = "allwinner,sun6i-a31-pll6-clk";
@@ -279,7 +279,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> +			clock-output-names = "pll6-2x";
 >>  		};
 >>  
->>  		cpu: cpu_clk@01c20050 {
+>>  		cpu: cpu_clk at 01c20050 {
 >> @@ -163,7 +172,7 @@
 >>  			#clock-cells = <0>;
 >>  			compatible = "allwinner,sun6i-a31-ahb1-clk";
@@ -367,7 +367,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> @@ -121,11 +121,11 @@
 >>  		};
 >>  
->>  		pll6: clk@01c20028 {
+>>  		pll6: clk at 01c20028 {
 >> -			#clock-cells = <1>;
 >> +			#clock-cells = <0>;
 >>  			compatible = "allwinner,sun6i-a31-pll6-clk";
@@ -401,7 +401,7 @@ On 05/02/16 17:59, Andre Przywara wrote:
 >> +			clock-output-names = "pll6-2x";
 >> +		};
 >> +
->> +		pll8: clk@01c20044 {
+>> +		pll8: clk at 01c20044 {
 >> +			#clock-cells = <0>;
 >> +			compatible = "allwinner,sun6i-a31-pll6-clk";
 >> +			reg = <0x01c20044 0x4>;
@@ -552,6 +552,6 @@ On 05/02/16 17:59, Andre Przywara wrote:
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel@lists.infradead.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 >
diff --git a/a/content_digest b/N1/content_digest
index c6330d3..bf72039 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,23 +1,9 @@
  "ref\01454358000-13594-1-git-send-email-maxime.ripard@free-electrons.com\0"
  "ref\056B4E2FB.3050703@arm.com\0"
- "From\0Andre Przywara <andre.przywara@arm.com>\0"
+ "From\0andre.przywara@arm.com (Andre Przywara)\0"
  "Subject\0breaking DT compatibility (was: Re: [PATCH v4] clk: sunxi: Refactor A31 PLL6 so that it can be reused)\0"
  "Date\0Wed, 10 Feb 2016 12:30:49 +0000\0"
- "To\0Mark Rutland <mark.rutland@arm.com>"
-  Rob Herring <rob.herring@linaro.org>
-  Grant Likely <grant.likely@linaro.org>
- " Frank Rowand <frowand.list@gmail.com>\0"
- "Cc\0Maxime Ripard <maxime.ripard@free-electrons.com>"
-  Chen-Yu Tsai <wens@csie.org>
-  Jean-Francois Moine <moinejf@free.fr>
-  Vishnu Patekar <vishnupatekar0510@gmail.com>
-  Mike Turquette <mturquette@baylibre.com>
-  Stephen Boyd <sboyd@codeaurora.org>
-  Hans de Goede <hdegoede@redhat.com>
-  devicetree@vger.kernel.org
-  Jens Kuske <jenskuske@gmail.com>
-  linux-clk@vger.kernel.org
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi,\n"
@@ -136,7 +122,7 @@
  ">> @@ -201,11 +201,11 @@\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tpll6: clk@01c20028 {\n"
+ ">>  \t\tpll6: clk at 01c20028 {\n"
  ">> -\t\t\t#clock-cells = <1>;\n"
  ">> +\t\t\t#clock-cells = <0>;\n"
  ">>  \t\t\tcompatible = \"allwinner,sun6i-a31-pll6-clk\";\n"
@@ -146,7 +132,7 @@
  ">> +\t\t\tclock-output-names = \"pll6\";\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tcpu: cpu@01c20050 {\n"
+ ">>  \t\tcpu: cpu at 01c20050 {\n"
  ">> @@ -235,7 +235,7 @@\n"
  ">>  \t\t\t#clock-cells = <0>;\n"
  ">>  \t\t\tcompatible = \"allwinner,sun6i-a31-ahb1-clk\";\n"
@@ -164,7 +150,7 @@
  ">> +\t\t\tassigned-clock-parents = <&pll6>;\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tahb1_gates: clk@01c20060 {\n"
+ ">>  \t\tahb1_gates: clk at 01c20060 {\n"
  ">> @@ -307,7 +307,7 @@\n"
  ">>  \t\t\t#clock-cells = <0>;\n"
  ">>  \t\t\tcompatible = \"allwinner,sun4i-a10-apb1-clk\";\n"
@@ -282,7 +268,7 @@
  ">> @@ -129,11 +129,20 @@\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tpll6: clk@01c20028 {\n"
+ ">>  \t\tpll6: clk at 01c20028 {\n"
  ">> -\t\t\t#clock-cells = <1>;\n"
  ">> +\t\t\t#clock-cells = <0>;\n"
  ">>  \t\t\tcompatible = \"allwinner,sun6i-a31-pll6-clk\";\n"
@@ -301,7 +287,7 @@
  ">> +\t\t\tclock-output-names = \"pll6-2x\";\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tcpu: cpu_clk@01c20050 {\n"
+ ">>  \t\tcpu: cpu_clk at 01c20050 {\n"
  ">> @@ -163,7 +172,7 @@\n"
  ">>  \t\t\t#clock-cells = <0>;\n"
  ">>  \t\t\tcompatible = \"allwinner,sun6i-a31-ahb1-clk\";\n"
@@ -389,7 +375,7 @@
  ">> @@ -121,11 +121,11 @@\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tpll6: clk@01c20028 {\n"
+ ">>  \t\tpll6: clk at 01c20028 {\n"
  ">> -\t\t\t#clock-cells = <1>;\n"
  ">> +\t\t\t#clock-cells = <0>;\n"
  ">>  \t\t\tcompatible = \"allwinner,sun6i-a31-pll6-clk\";\n"
@@ -423,7 +409,7 @@
  ">> +\t\t\tclock-output-names = \"pll6-2x\";\n"
  ">> +\t\t};\n"
  ">> +\n"
- ">> +\t\tpll8: clk@01c20044 {\n"
+ ">> +\t\tpll8: clk at 01c20044 {\n"
  ">> +\t\t\t#clock-cells = <0>;\n"
  ">> +\t\t\tcompatible = \"allwinner,sun6i-a31-pll6-clk\";\n"
  ">> +\t\t\treg = <0x01c20044 0x4>;\n"
@@ -574,8 +560,8 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel@lists.infradead.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  >
 
-5ad132d868667ac50422b12cabcf9274e6a6aa11e56f43800a9ff023f7328c1f
+7ba6f454b8d7c1c7609938380ba96030560895af1da37f51aceb22826508785e
