diff for duplicates of <20150821103122.GA17542@codeaurora.org>

diff --git a/a/1.txt b/N1/1.txt
index 6ddd169..0ee26f0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -57,7 +57,7 @@ Varada
 > +	};
 > +
 > +	soc {
-> +		serial@78b0000 {
+> +		serial at 78b0000 {
 > +			status = "ok";
 > +		};
 > +	};
@@ -93,25 +93,25 @@ Varada
 > +	cpus {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
-> +		cpu@0 {
+> +		cpu at 0 {
 > +			device_type = "cpu";
 > +			compatible = "arm,cortex-a7";
 > +			reg = <0x0>;
 > +		};
 > +
-> +		cpu@1 {
+> +		cpu at 1 {
 > +			device_type = "cpu";
 > +			compatible = "arm,cortex-a7";
 > +			reg = <0x1>;
 > +		};
 > +
-> +		cpu@2 {
+> +		cpu at 2 {
 > +			device_type = "cpu";
 > +			compatible = "arm,cortex-a7";
 > +			reg = <0x2>;
 > +		};
 > +
-> +		cpu@3 {
+> +		cpu at 3 {
 > +			device_type = "cpu";
 > +			compatible = "arm,cortex-a7";
 > +			reg = <0x3>;
@@ -124,7 +124,7 @@ Varada
 > +		ranges;
 > +		compatible = "simple-bus";
 > +
-> +		intc: interrupt-controller@b000000 {
+> +		intc: interrupt-controller at b000000 {
 > +			compatible = "qcom,msm-qgic2";
 > +			interrupt-controller;
 > +			#interrupt-cells = <3>;
@@ -141,7 +141,7 @@ Varada
 > +			clock-frequency = <20833333>;
 > +		};
 > +
-> +		serial@78b0000 {
+> +		serial at 78b0000 {
 > +			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
 > +			reg = <0x78b0000 0x200>;
 > +			interrupts = <0 108 0>;
@@ -189,5 +189,5 @@ Varada
 > 
 > _______________________________________________
 > 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 0a00dfb..aed1ad1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,25 +1,8 @@
  "ref\020150821092035.GA22319@codeaurora.org\0"
- "From\0Varadarajan Narayanan <varada@codeaurora.org>\0"
- "Subject\0Re: [PATCH] qcom: ipq40xx: Add basic board/dts support for IPQ40XX SoC\0"
+ "From\0varada@codeaurora.org (Varadarajan Narayanan)\0"
+ "Subject\0[PATCH] qcom: ipq40xx: Add basic board/dts support for IPQ40XX SoC\0"
  "Date\0Fri, 21 Aug 2015 16:01:22 +0530\0"
- "To\0Rob Herring <robh+dt@kernel.org>"
-  Pawel Moll <pawel.moll@arm.com>
-  Mark Rutland <mark.rutland@arm.com>
-  Ian Campbell <ijc+devicetree@hellion.org.uk>
-  Kumar Gala <galak@codeaurora.org>
-  Russell King <linux@arm.linux.org.uk>
-  Andy Gross <agross@codeaurora.org>
-  David Brown <davidb@codeaurora.org>
-  Stephen Boyd <sboyd@codeaurora.org>
-  Lina Iyer <lina.iyer@linaro.org>
-  Georgi Djakov <gdjakov@mm-sol.com>
-  devicetree@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
-  linux-kernel@vger.kernel.org
-  linux-arm-msm@vger.kernel.org
- " linux-soc@vger.kernel.org\0"
- "Cc\0snlakshm@codeaurora.org"
- " jaigan@codeaurora.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Aug 21, 2015 at 02:50:35PM +0530, Varadarajan Narayanan wrote:\n"
@@ -81,7 +64,7 @@
  "> +\t};\n"
  "> +\n"
  "> +\tsoc {\n"
- "> +\t\tserial@78b0000 {\n"
+ "> +\t\tserial at 78b0000 {\n"
  "> +\t\t\tstatus = \"ok\";\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -117,25 +100,25 @@
  "> +\tcpus {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
- "> +\t\tcpu@0 {\n"
+ "> +\t\tcpu at 0 {\n"
  "> +\t\t\tdevice_type = \"cpu\";\n"
  "> +\t\t\tcompatible = \"arm,cortex-a7\";\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tcpu@1 {\n"
+ "> +\t\tcpu at 1 {\n"
  "> +\t\t\tdevice_type = \"cpu\";\n"
  "> +\t\t\tcompatible = \"arm,cortex-a7\";\n"
  "> +\t\t\treg = <0x1>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tcpu@2 {\n"
+ "> +\t\tcpu at 2 {\n"
  "> +\t\t\tdevice_type = \"cpu\";\n"
  "> +\t\t\tcompatible = \"arm,cortex-a7\";\n"
  "> +\t\t\treg = <0x2>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tcpu@3 {\n"
+ "> +\t\tcpu at 3 {\n"
  "> +\t\t\tdevice_type = \"cpu\";\n"
  "> +\t\t\tcompatible = \"arm,cortex-a7\";\n"
  "> +\t\t\treg = <0x3>;\n"
@@ -148,7 +131,7 @@
  "> +\t\tranges;\n"
  "> +\t\tcompatible = \"simple-bus\";\n"
  "> +\n"
- "> +\t\tintc: interrupt-controller@b000000 {\n"
+ "> +\t\tintc: interrupt-controller at b000000 {\n"
  "> +\t\t\tcompatible = \"qcom,msm-qgic2\";\n"
  "> +\t\t\tinterrupt-controller;\n"
  "> +\t\t\t#interrupt-cells = <3>;\n"
@@ -165,7 +148,7 @@
  "> +\t\t\tclock-frequency = <20833333>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tserial@78b0000 {\n"
+ "> +\t\tserial at 78b0000 {\n"
  "> +\t\t\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n"
  "> +\t\t\treg = <0x78b0000 0x200>;\n"
  "> +\t\t\tinterrupts = <0 108 0>;\n"
@@ -213,7 +196,7 @@
  "> \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
 
-4ceb2ea02ed779958c61b01035f0b34832103c65f44a760d9a4c54c749b46fa8
+2a0287e2fbfdcaf2cc804355ad5fbddb29da04604f467b36306da5dfbaac67ac
