diff for duplicates of <20150825081042.GA14028@codeaurora.org>

diff --git a/a/1.txt b/N1/1.txt
index b21e589..6500ed4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -90,7 +90,7 @@ Since this is for the emulation platform, we don't have the bootloader.
 
 > > +
 > > +	soc {
-> > +		serial@78b0000 {
+> > +		serial at 78b0000 {
 > > +			status = "ok";
 > > +		};
 > > +	};
@@ -132,25 +132,25 @@ Ok.
 > > +	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>;
@@ -163,7 +163,7 @@ Ok.
 > > +		ranges;
 > > +		compatible = "simple-bus";
 > > +
-> > +		intc: interrupt-controller@b000000 {
+> > +		intc: interrupt-controller at b000000 {
 > > +			compatible = "qcom,msm-qgic2";
 > > +			interrupt-controller;
 > > +			#interrupt-cells = <3>;
@@ -194,7 +194,7 @@ https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/bo
 
 > > +		};
 > > +
-> > +		serial@78b0000 {
+> > +		serial at 78b0000 {
 > > +			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
 > > +			reg = <0x78b0000 0x200>;
 > > +			interrupts = <0 108 0>;
@@ -267,5 +267,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 30b861d..e0706ed 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,24 +1,9 @@
  "ref\020150824092813.GA15581@codeaurora.org\0"
  "ref\020150824224928.GE14330@codeaurora.org\0"
- "From\0Varadarajan Narayanan <varada@codeaurora.org>\0"
- "Subject\0Re: [PATCH v3] qcom: ipq40xx: Add basic board/dts support for IPQ40XX SoC\0"
+ "From\0varada@codeaurora.org (Varadarajan Narayanan)\0"
+ "Subject\0[PATCH v3] qcom: ipq40xx: Add basic board/dts support for IPQ40XX SoC\0"
  "Date\0Tue, 25 Aug 2015 13:40:42 +0530\0"
- "To\0Stephen Boyd <sboyd@codeaurora.org>\0"
- "Cc\0Mark Rutland <mark.rutland@arm.com>"
-  devicetree@vger.kernel.org
-  Russell King <linux@arm.linux.org.uk>
-  Pawel Moll <pawel.moll@arm.com>
-  Ian Campbell <ijc+devicetree@hellion.org.uk>
-  linux-arm-msm@vger.kernel.org
-  Andy Gross <agross@codeaurora.org>
-  linux-kernel@vger.kernel.org
-  Rob Herring <robh+dt@kernel.org>
-  Georgi Djakov <gdjakov@mm-sol.com>
-  Kumar Gala <galak@codeaurora.org>
-  David Brown <davidb@codeaurora.org>
-  linux-soc@vger.kernel.org
-  Lina Iyer <lina.iyer@linaro.org>
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, Aug 24, 2015 at 03:49:28PM -0700, Stephen Boyd wrote:\n"
@@ -113,7 +98,7 @@
  "\n"
  "> > +\n"
  "> > +\tsoc {\n"
- "> > +\t\tserial@78b0000 {\n"
+ "> > +\t\tserial at 78b0000 {\n"
  "> > +\t\t\tstatus = \"ok\";\n"
  "> > +\t\t};\n"
  "> > +\t};\n"
@@ -155,25 +140,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"
@@ -186,7 +171,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"
@@ -217,7 +202,7 @@
  "\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"
@@ -290,7 +275,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
 
-a6b661beff800d24df7a9140e2d16e53e9a9f7463218b225a89a037e49263dc5
+a384a02e1ccde68438e913ede8e06f6be4232ac2104c01d71606e4bb9f068801
