diff for duplicates of <20141024105111.GD24265@leverpostej>

diff --git a/a/1.txt b/N1/1.txt
index 341e7c5..56d25a6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -49,7 +49,7 @@ Are other architectures not affected by this limitation?
 > +		#size-cells = <2>;
 > +		ranges;
 > +
-> +		firmware-memory@0x80000000 {
+> +		firmware-memory at 0x80000000 {
 > +			no-map;
 > +			reg = <0x0 0x80000000 0x0 0x00010000>;
 > +		};
@@ -67,7 +67,7 @@ Linux should be able to handle this from now on, however.
 Thanks,
 Mark.
 
->  	gic: interrupt-controller@2c001000 {
+>  	gic: interrupt-controller at 2c001000 {
 >  		compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
 >  		#interrupt-cells = <3>;
 > diff --git a/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
@@ -92,13 +92,13 @@ Mark.
 > +		#size-cells = <2>;
 > +		ranges;
 > +
-> +		firmware-memory@0x80000000 {
+> +		firmware-memory at 0x80000000 {
 > +			no-map;
 > +			reg = <0x0 0x80000000 0x0 0x00010000>;
 > +		};
 > +	};
 > +
->  	gic: interrupt-controller@2c001000 {
+>  	gic: interrupt-controller at 2c001000 {
 >  		compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
 >  		#interrupt-cells = <3>;
 > -- 
@@ -108,11 +108,6 @@ Mark.
 > 
 > _______________________________________________
 > 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
-> 
-
-_______________________________________________
-kexec mailing list
-kexec@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/kexec
+>
diff --git a/a/content_digest b/N1/content_digest
index 8bb3caa..56e5608 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,9 @@
  "ref\0cover.1414099246.git.geoff@infradead.org\0"
  "ref\0411296ab915959b862923d827e730a1db2ff9b4e.1414099246.git.geoff@infradead.org\0"
- "From\0Mark Rutland <mark.rutland@arm.com>\0"
- "Subject\0Re: [PATCH 05/10] arm64: Convert dts to use reserved-memory nodes\0"
+ "From\0mark.rutland@arm.com (Mark Rutland)\0"
+ "Subject\0[PATCH 05/10] arm64: Convert dts to use reserved-memory nodes\0"
  "Date\0Fri, 24 Oct 2014 11:51:11 +0100\0"
- "To\0Geoff Levand <geoff@infradead.org>"
- " grant.likely@linaro.org <grant.likely@linaro.org>\0"
- "Cc\0Ian Campbell <ian.campbell@citrix.com>"
-  Stefano Stabellini <stefano.stabellini@eu.citrix.com>
-  Marc Zyngier <Marc.Zyngier@arm.com>
-  Catalin Marinas <Catalin.Marinas@arm.com>
-  Will Deacon <Will.Deacon@arm.com>
-  linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
-  kexec@lists.infradead.org <kexec@lists.infradead.org>
- " christoffer.dall@linaro.org <christoffer.dall@linaro.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Oct 24, 2014 at 12:10:58AM +0100, Geoff Levand wrote:\n"
@@ -66,7 +57,7 @@
  "> +\t\t#size-cells = <2>;\n"
  "> +\t\tranges;\n"
  "> +\n"
- "> +\t\tfirmware-memory@0x80000000 {\n"
+ "> +\t\tfirmware-memory at 0x80000000 {\n"
  "> +\t\t\tno-map;\n"
  "> +\t\t\treg = <0x0 0x80000000 0x0 0x00010000>;\n"
  "> +\t\t};\n"
@@ -84,7 +75,7 @@
  "Thanks,\n"
  "Mark.\n"
  "\n"
- ">  \tgic: interrupt-controller@2c001000 {\n"
+ ">  \tgic: interrupt-controller at 2c001000 {\n"
  ">  \t\tcompatible = \"arm,cortex-a15-gic\", \"arm,cortex-a9-gic\";\n"
  ">  \t\t#interrupt-cells = <3>;\n"
  "> diff --git a/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts\n"
@@ -109,13 +100,13 @@
  "> +\t\t#size-cells = <2>;\n"
  "> +\t\tranges;\n"
  "> +\n"
- "> +\t\tfirmware-memory@0x80000000 {\n"
+ "> +\t\tfirmware-memory at 0x80000000 {\n"
  "> +\t\t\tno-map;\n"
  "> +\t\t\treg = <0x0 0x80000000 0x0 0x00010000>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
  "> +\n"
- ">  \tgic: interrupt-controller@2c001000 {\n"
+ ">  \tgic: interrupt-controller at 2c001000 {\n"
  ">  \t\tcompatible = \"arm,cortex-a15-gic\", \"arm,cortex-a9-gic\";\n"
  ">  \t\t#interrupt-cells = <3>;\n"
  "> -- \n"
@@ -125,13 +116,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"
- "> \n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ >
 
-841a9b445b2020f87f0c5e3d7b9d6298cfaa8423c6df70988e349e896ae3d5a8
+f497d6e838d916fa231dc11be4232747b292c7a45eee54e7998c1f59c4a1b08e
