diff for duplicates of <20131107134802.2234bff1@xhacker>

diff --git a/a/1.txt b/N1/1.txt
index 2e0d689..c7c396f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,10 +21,10 @@ Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote:
 > Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
 > Cc: Rob Landley <rob@landley.net>
 > Cc: Russell King <linux@arm.linux.org.uk>
-> Cc: devicetree at vger.kernel.org
-> Cc: linux-doc at vger.kernel.org
-> Cc: linux-arm-kernel at lists.infradead.org
-> Cc: linux-kernel at vger.kernel.org
+> Cc: devicetree@vger.kernel.org
+> Cc: linux-doc@vger.kernel.org
+> Cc: linux-arm-kernel@lists.infradead.org
+> Cc: linux-kernel@vger.kernel.org
 > ---
 >  arch/arm/boot/dts/Makefile                        |    3 +-
 >  arch/arm/boot/dts/berlin2cd-google-chromecast.dts |   29 +++
@@ -112,7 +112,7 @@ Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote:
 > +               #address-cells = <1>;
 > +               #size-cells = <0>;
 > +
-> +               cpu at 0 {
+> +               cpu@0 {
 > +                       compatible = "arm,cortex-a9";
 > +                       device_type = "cpu";
 > +                       next-level-cache = <&l2>;
@@ -148,7 +148,7 @@ Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote:
 > +
 > +               ranges = <0 0xf7000000 0x1000000>;
 > +
-> +               l2: l2-cache-controller at ac0000 {
+> +               l2: l2-cache-controller@ac0000 {
 > +                       compatible = "arm,pl310-cache";
 > +                       reg = <0xac0000 0x1000>;
 > +                       cache-unified;
@@ -161,21 +161,21 @@ We have it in our internal tree for a long time.
 http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/209700.html
 > +               };
 > +
-> +               gic: interrupt-controller at ad1000 {
+> +               gic: interrupt-controller@ad1000 {
 > +                       compatible = "arm,cortex-a9-gic";
 > +                       reg = <0xad1000 0x1000>, <0xad0100 0x0100>;
 > +                       interrupt-controller;
 > +                       #interrupt-cells = <3>;
 > +               };
 > +
-> +               local-timer at ad0600 {
+> +               local-timer@ad0600 {
 > +                       compatible = "arm,cortex-a9-twd-timer";
 > +                       reg = <0xad0600 0x20>;
 > +                       interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
 > +                       clocks = <&sysclk>;
 > +               };
 > +
-> +               apb at e80000 {
+> +               apb@e80000 {
 > +                       compatible = "simple-bus";
 > +                       #address-cells = <1>;
 > +                       #size-cells = <1>;
@@ -183,7 +183,7 @@ http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/209700.html
 > +                       ranges = <0 0xe80000 0x10000>;
 > +                       interrupt-parent = <&aic>;
 > +
-> +                       timer0: timer at 2c00 {
+> +                       timer0: timer@2c00 {
 > +                               compatible = "snps,dw-apb-timer";
 snps,dw-apb-timer-osc?
 > +                               reg = <0x2c00 0x14>;
@@ -193,7 +193,7 @@ snps,dw-apb-timer-osc?
 > +                               status = "okay";
 > +                       };
 > +
-> +                       timer1: timer at 2c14 {
+> +                       timer1: timer@2c14 {
 > +                               compatible = "snps,dw-apb-timer";
 ditto for the remaining
 > +                               reg = <0x2c14 0x14>;
@@ -203,7 +203,7 @@ ditto for the remaining
 > +                               status = "okay";
 > +                       };
 > +
-> +                       timer2: timer at 2c28 {
+> +                       timer2: timer@2c28 {
 > +                               compatible = "snps,dw-apb-timer";
 > +                               reg = <0x2c28 0x14>;
 > +                               interrupts = <10>;
@@ -212,7 +212,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       timer3: timer at 2c3c {
+> +                       timer3: timer@2c3c {
 > +                               compatible = "snps,dw-apb-timer";
 > +                               reg = <0x2c3c 0x14>;
 > +                               interrupts = <11>;
@@ -221,7 +221,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       timer4: timer at 2c50 {
+> +                       timer4: timer@2c50 {
 > +                               compatible = "snps,dw-apb-timer";
 > +                               reg = <0x2c50 0x14>;
 > +                               interrupts = <12>;
@@ -230,7 +230,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       timer5: timer at 2c64 {
+> +                       timer5: timer@2c64 {
 > +                               compatible = "snps,dw-apb-timer";
 > +                               reg = <0x2c64 0x14>;
 > +                               interrupts = <13>;
@@ -239,7 +239,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       timer6: timer at 2c78 {
+> +                       timer6: timer@2c78 {
 > +                               compatible = "snps,dw-apb-timer";
 > +                               reg = <0x2c78 0x14>;
 > +                               interrupts = <14>;
@@ -248,7 +248,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       timer7: timer at 2c8c {
+> +                       timer7: timer@2c8c {
 > +                               compatible = "snps,dw-apb-timer";
 > +                               reg = <0x2c8c 0x14>;
 > +                               interrupts = <15>;
@@ -257,7 +257,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       aic: interrupt-controller at 3000 {
+> +                       aic: interrupt-controller@3000 {
 > +                               compatible = "snps,dw-apb-ictl";
 > +                               reg = <0x3000 0xc00>;
 > +                               interrupt-controller;
@@ -268,7 +268,7 @@ ditto for the remaining
 > +                       };
 > +               };
 > +
-> +               apb at fc0000 {
+> +               apb@fc0000 {
 > +                       compatible = "simple-bus";
 > +                       #address-cells = <1>;
 > +                       #size-cells = <1>;
@@ -276,7 +276,7 @@ ditto for the remaining
 > +                       ranges = <0 0xfc0000 0x10000>;
 > +                       interrupt-parent = <&sic>;
 > +
-> +                       uart0: serial at 9000 {
+> +                       uart0: serial@9000 {
 > +                               compatible = "snps,dw-apb-uart";
 > +                               reg = <0x9000 0x100>;
 > +                               reg-shift = <2>;
@@ -286,7 +286,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       uart1: serial at a000 {
+> +                       uart1: serial@a000 {
 > +                               compatible = "snps,dw-apb-uart";
 > +                               reg = <0xa000 0x100>;
 > +                               reg-shift = <2>;
@@ -296,7 +296,7 @@ ditto for the remaining
 > +                               status = "disabled";
 > +                       };
 > +
-> +                       sic: interrupt-controller at e000 {
+> +                       sic: interrupt-controller@e000 {
 > +                               compatible = "snps,dw-apb-ictl";
 > +                               reg = <0xe000 0x400>;
 > +                               interrupt-controller;
@@ -314,5 +314,5 @@ ditto for the remaining
 > 
 > _______________________________________________
 > 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 a039b51..ab5914e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,21 @@
  "ref\01381235073-17134-1-git-send-email-sebastian.hesselbarth@gmail.com\0"
  "ref\01383661723-17956-1-git-send-email-sebastian.hesselbarth@gmail.com\0"
  "ref\01383661723-17956-9-git-send-email-sebastian.hesselbarth@gmail.com\0"
- "From\0jszhang@marvell.com (Jisheng Zhang)\0"
- "Subject\0[PATCH v3 8/9] ARM: add Armada 1500-mini and Chromecast device tree files\0"
+ "From\0Jisheng Zhang <jszhang@marvell.com>\0"
+ "Subject\0Re: [PATCH v3 8/9] ARM: add Armada 1500-mini and Chromecast device tree files\0"
  "Date\0Thu, 7 Nov 2013 13:48:02 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org <devicetree@vger.kernel.org>
+  Russell King <linux@arm.linux.org.uk>
+  Pawel Moll <pawel.moll@arm.com>
+  Ian Campbell <ijc+devicetree@hellion.org.uk>
+  Stephen Warren <swarren@wwwdotorg.org>
+  linux-doc@vger.kernel.org <linux-doc@vger.kernel.org>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  Rob Herring <rob.herring@calxeda.com>
+  Rob Landley <rob@landley.net>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "On Tue, 5 Nov 2013 06:28:42 -0800\n"
@@ -30,10 +41,10 @@
  "> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>\n"
  "> Cc: Rob Landley <rob@landley.net>\n"
  "> Cc: Russell King <linux@arm.linux.org.uk>\n"
- "> Cc: devicetree at vger.kernel.org\n"
- "> Cc: linux-doc at vger.kernel.org\n"
- "> Cc: linux-arm-kernel at lists.infradead.org\n"
- "> Cc: linux-kernel at vger.kernel.org\n"
+ "> Cc: devicetree@vger.kernel.org\n"
+ "> Cc: linux-doc@vger.kernel.org\n"
+ "> Cc: linux-arm-kernel@lists.infradead.org\n"
+ "> Cc: linux-kernel@vger.kernel.org\n"
  "> ---\n"
  ">  arch/arm/boot/dts/Makefile                        |    3 +-\n"
  ">  arch/arm/boot/dts/berlin2cd-google-chromecast.dts |   29 +++\n"
@@ -121,7 +132,7 @@
  "> +               #address-cells = <1>;\n"
  "> +               #size-cells = <0>;\n"
  "> +\n"
- "> +               cpu at 0 {\n"
+ "> +               cpu@0 {\n"
  "> +                       compatible = \"arm,cortex-a9\";\n"
  "> +                       device_type = \"cpu\";\n"
  "> +                       next-level-cache = <&l2>;\n"
@@ -157,7 +168,7 @@
  "> +\n"
  "> +               ranges = <0 0xf7000000 0x1000000>;\n"
  "> +\n"
- "> +               l2: l2-cache-controller at ac0000 {\n"
+ "> +               l2: l2-cache-controller@ac0000 {\n"
  "> +                       compatible = \"arm,pl310-cache\";\n"
  "> +                       reg = <0xac0000 0x1000>;\n"
  "> +                       cache-unified;\n"
@@ -170,21 +181,21 @@
  "http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/209700.html\n"
  "> +               };\n"
  "> +\n"
- "> +               gic: interrupt-controller at ad1000 {\n"
+ "> +               gic: interrupt-controller@ad1000 {\n"
  "> +                       compatible = \"arm,cortex-a9-gic\";\n"
  "> +                       reg = <0xad1000 0x1000>, <0xad0100 0x0100>;\n"
  "> +                       interrupt-controller;\n"
  "> +                       #interrupt-cells = <3>;\n"
  "> +               };\n"
  "> +\n"
- "> +               local-timer at ad0600 {\n"
+ "> +               local-timer@ad0600 {\n"
  "> +                       compatible = \"arm,cortex-a9-twd-timer\";\n"
  "> +                       reg = <0xad0600 0x20>;\n"
  "> +                       interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;\n"
  "> +                       clocks = <&sysclk>;\n"
  "> +               };\n"
  "> +\n"
- "> +               apb at e80000 {\n"
+ "> +               apb@e80000 {\n"
  "> +                       compatible = \"simple-bus\";\n"
  "> +                       #address-cells = <1>;\n"
  "> +                       #size-cells = <1>;\n"
@@ -192,7 +203,7 @@
  "> +                       ranges = <0 0xe80000 0x10000>;\n"
  "> +                       interrupt-parent = <&aic>;\n"
  "> +\n"
- "> +                       timer0: timer at 2c00 {\n"
+ "> +                       timer0: timer@2c00 {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "snps,dw-apb-timer-osc?\n"
  "> +                               reg = <0x2c00 0x14>;\n"
@@ -202,7 +213,7 @@
  "> +                               status = \"okay\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer1: timer at 2c14 {\n"
+ "> +                       timer1: timer@2c14 {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "ditto for the remaining\n"
  "> +                               reg = <0x2c14 0x14>;\n"
@@ -212,7 +223,7 @@
  "> +                               status = \"okay\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer2: timer at 2c28 {\n"
+ "> +                       timer2: timer@2c28 {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "> +                               reg = <0x2c28 0x14>;\n"
  "> +                               interrupts = <10>;\n"
@@ -221,7 +232,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer3: timer at 2c3c {\n"
+ "> +                       timer3: timer@2c3c {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "> +                               reg = <0x2c3c 0x14>;\n"
  "> +                               interrupts = <11>;\n"
@@ -230,7 +241,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer4: timer at 2c50 {\n"
+ "> +                       timer4: timer@2c50 {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "> +                               reg = <0x2c50 0x14>;\n"
  "> +                               interrupts = <12>;\n"
@@ -239,7 +250,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer5: timer at 2c64 {\n"
+ "> +                       timer5: timer@2c64 {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "> +                               reg = <0x2c64 0x14>;\n"
  "> +                               interrupts = <13>;\n"
@@ -248,7 +259,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer6: timer at 2c78 {\n"
+ "> +                       timer6: timer@2c78 {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "> +                               reg = <0x2c78 0x14>;\n"
  "> +                               interrupts = <14>;\n"
@@ -257,7 +268,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       timer7: timer at 2c8c {\n"
+ "> +                       timer7: timer@2c8c {\n"
  "> +                               compatible = \"snps,dw-apb-timer\";\n"
  "> +                               reg = <0x2c8c 0x14>;\n"
  "> +                               interrupts = <15>;\n"
@@ -266,7 +277,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       aic: interrupt-controller at 3000 {\n"
+ "> +                       aic: interrupt-controller@3000 {\n"
  "> +                               compatible = \"snps,dw-apb-ictl\";\n"
  "> +                               reg = <0x3000 0xc00>;\n"
  "> +                               interrupt-controller;\n"
@@ -277,7 +288,7 @@
  "> +                       };\n"
  "> +               };\n"
  "> +\n"
- "> +               apb at fc0000 {\n"
+ "> +               apb@fc0000 {\n"
  "> +                       compatible = \"simple-bus\";\n"
  "> +                       #address-cells = <1>;\n"
  "> +                       #size-cells = <1>;\n"
@@ -285,7 +296,7 @@
  "> +                       ranges = <0 0xfc0000 0x10000>;\n"
  "> +                       interrupt-parent = <&sic>;\n"
  "> +\n"
- "> +                       uart0: serial at 9000 {\n"
+ "> +                       uart0: serial@9000 {\n"
  "> +                               compatible = \"snps,dw-apb-uart\";\n"
  "> +                               reg = <0x9000 0x100>;\n"
  "> +                               reg-shift = <2>;\n"
@@ -295,7 +306,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       uart1: serial at a000 {\n"
+ "> +                       uart1: serial@a000 {\n"
  "> +                               compatible = \"snps,dw-apb-uart\";\n"
  "> +                               reg = <0xa000 0x100>;\n"
  "> +                               reg-shift = <2>;\n"
@@ -305,7 +316,7 @@
  "> +                               status = \"disabled\";\n"
  "> +                       };\n"
  "> +\n"
- "> +                       sic: interrupt-controller at e000 {\n"
+ "> +                       sic: interrupt-controller@e000 {\n"
  "> +                               compatible = \"snps,dw-apb-ictl\";\n"
  "> +                               reg = <0xe000 0x400>;\n"
  "> +                               interrupt-controller;\n"
@@ -323,7 +334,7 @@
  "> \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
 
-5a7cbe2972764fe89cc4e2f6d93b36b50987407e3aad829f8754bd737fc5da76
+3969886a69970f4681cc815dc2b950996a602bf2c2765a0dd6580affe594a240
