diff for duplicates of <20150727143444.GD15004@beef>

diff --git a/a/1.txt b/N1/1.txt
index 3bc8734..bb1a865 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -58,7 +58,7 @@ on these SOMs.
 > +	};
 > +
 > +	cpus {
-> +		cpu@0 {
+> +		cpu at 0 {
 > +			cpu0-supply = <&vdd1_reg>;
 > +		};
 > +	};
@@ -68,7 +68,7 @@ on these SOMs.
 > +		reg = <0x80000000 0x10000000>; /* 256 MB */
 > +	};
 > +
-> +	vbat: fixedregulator@0 {
+> +	vbat: fixedregulator at 0 {
 > +		compatible = "regulator-fixed";
 > +	};
 > +};
@@ -145,18 +145,18 @@ on these SOMs.
 > +	clock-frequency = <400000>;
 > +	status = "okay";
 > +
-> +	tps: pmic@2d {
+> +	tps: pmic at 2d {
 > +		reg = <0x2d>;
 > +	};
 > +
-> +	i2c_eeprom: eeprom@52 {
+> +	i2c_eeprom: eeprom at 52 {
 > +		compatible = "atmel,24c32";
 > +		pagesize = <32>;
 > +		reg = <0x52>;
 > +		status = "disabled";
 > +	};
 > +
-> +	i2c_rtc: rtc@68 {
+> +	i2c_rtc: rtc at 68 {
 > +		compatible = "rv4162";
 > +		reg = <0x68>;
 > +		status = "disabled";
@@ -194,7 +194,7 @@ on these SOMs.
 > +	pinctrl-names = "default";
 > +	pinctrl-0 = <&nandflash_pins>;
 > +	ranges = <0 0 0x08000000 0x1000000>;   /* CS0: NAND */
-> +	nandflash: nand@0,0 {
+> +	nandflash: nand at 0,0 {
 > +		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
 > +		nand-bus-width = <8>;
 > +		ti,nand-ecc-opt = "bch8";
@@ -229,39 +229,39 @@ on these SOMs.
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +
-> +		partition@0 {
+> +		partition at 0 {
 > +			label = "xload";
 > +			reg = <0x0 0x20000>;
 > +		};
-> +		partition@1 {
+> +		partition at 1 {
 > +			label = "xload_backup1";
 > +			reg = <0x20000 0x20000>;
 > +		};
-> +		partition@2 {
+> +		partition at 2 {
 > +			label = "xload_backup2";
 > +			reg = <0x40000 0x20000>;
 > +		};
-> +		partition@3 {
+> +		partition at 3 {
 > +			label = "xload_backup3";
 > +			reg = <0x60000 0x20000>;
 > +		};
-> +		partition@4 {
+> +		partition at 4 {
 > +			label = "barebox";
 > +			reg = <0x80000 0x80000>;
 > +		};
-> +		partition@5 {
+> +		partition at 5 {
 > +			label = "bareboxenv";
 > +			reg = <0x100000 0x40000>;
 > +		};
-> +		partition@6 {
+> +		partition at 6 {
 > +			label = "oftree";
 > +			reg = <0x140000 0x40000>;
 > +		};
-> +		partition@7 {
+> +		partition at 7 {
 > +			label = "kernel";
 > +			reg = <0x180000 0x800000>;
 > +		};
-> +		partition@8 {
+> +		partition at 8 {
 > +			label = "root";
 > +			reg = <0x980000 0x0>;
 > +		};
@@ -282,15 +282,15 @@ on these SOMs.
 > +	vccio-supply = <&vbat>;
 > +
 > +	regulators {
-> +		vrtc_reg: regulator@0 {
+> +		vrtc_reg: regulator at 0 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vio_reg: regulator@1 {
+> +		vio_reg: regulator at 1 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vdd1_reg: regulator@2 {
+> +		vdd1_reg: regulator at 2 {
 > +			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
 > +			regulator-name = "vdd_mpu";
 > +			regulator-min-microvolt = <912500>;
@@ -299,7 +299,7 @@ on these SOMs.
 > +			regulator-always-on;
 > +		};
 > +
-> +		vdd2_reg: regulator@3 {
+> +		vdd2_reg: regulator at 3 {
 > +			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
 > +			regulator-name = "vdd_core";
 > +			regulator-min-microvolt = <912500>;
@@ -308,41 +308,41 @@ on these SOMs.
 > +			regulator-always-on;
 > +		};
 > +
-> +		vdd3_reg: regulator@4 {
+> +		vdd3_reg: regulator at 4 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vdig1_reg: regulator@5 {
+> +		vdig1_reg: regulator at 5 {
 > +			regulator-name = "vdig1_1p8v";
 > +			regulator-min-microvolt = <1800000>;
 > +			regulator-max-microvolt = <1800000>;
 > +		};
 > +
-> +		vdig2_reg: regulator@6 {
+> +		vdig2_reg: regulator at 6 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vpll_reg: regulator@7 {
+> +		vpll_reg: regulator at 7 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vdac_reg: regulator@8 {
+> +		vdac_reg: regulator at 8 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vaux1_reg: regulator@9 {
+> +		vaux1_reg: regulator at 9 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vaux2_reg: regulator@10 {
+> +		vaux2_reg: regulator at 10 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vaux33_reg: regulator@11 {
+> +		vaux33_reg: regulator at 11 {
 > +			regulator-always-on;
 > +		};
 > +
-> +		vmmc_reg: regulator@12 {
+> +		vmmc_reg: regulator at 12 {
 > +			regulator-min-microvolt = <3300000>;
 > +			regulator-max-microvolt = <3300000>;
 > +			regulator-always-on;
@@ -374,7 +374,7 @@ on these SOMs.
 > +	pinctrl-0 = <&spi0_pins>;
 > +	status = "okay";
 > +
-> +	serial_flash: m25p80@0 {
+> +	serial_flash: m25p80 at 0 {
 > +		compatible = "m25p80";
 > +		spi-max-frequency = <48000000>;
 > +		reg = <0x0>;
@@ -383,23 +383,23 @@ on these SOMs.
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +
-> +		partition@0 {
+> +		partition at 0 {
 > +			label = "xload";
 > +			reg = <0x0 0x20000>;
 > +		};
-> +		partition@1 {
+> +		partition at 1 {
 > +			label = "barebox";
 > +			reg = <0x20000 0x80000>;
 > +		};
-> +		partition@2 {
+> +		partition at 2 {
 > +			label = "bareboxenv";
 > +			reg = <0xa0000 0x20000>;
 > +		};
-> +		partition@3 {
+> +		partition at 3 {
 > +			label = "oftree";
 > +			reg = <0xc0000 0x20000>;
 > +		};
-> +		partition@4 {
+> +		partition at 4 {
 > +			label = "kernel";
 > +			reg = <0xe0000 0x0>;
 > +		};
@@ -411,5 +411,5 @@ on these SOMs.
 > 
 > _______________________________________________
 > 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 6a7e073..14ddd56 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,19 +1,8 @@
  "ref\01437035449-26956-1-git-send-email-t.remmet@phytec.de\0"
- "From\0Matt Porter <mporter@konsulko.com>\0"
- "Subject\0Re: [PATCH 1/2] ARM: dts: Add support for phyCORE-AM335x SoM\0"
+ "From\0mporter@konsulko.com (Matt Porter)\0"
+ "Subject\0[PATCH 1/2] ARM: dts: Add support for phyCORE-AM335x SoM\0"
  "Date\0Mon, 27 Jul 2015 10:34:44 -0400\0"
- "To\0Teresa Remmet <t.remmet@phytec.de>\0"
- "Cc\0linux-omap@vger.kernel.org"
-  devicetree@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
-  linux-kernel@vger.kernel.org
-  Mark Rutland <mark.rutland@arm.com>
-  Pawel Moll <pawel.moll@arm.com>
-  Ian Campbell <ijc+devicetree@hellion.org.uk>
-  Tony Lindgren <tony@atomide.com>
-  Rob Herring <robh+dt@kernel.org>
- " Beno\303\256t Cousson <bcousson@baylibre.com>"
- " Kumar Gala <galak@codeaurora.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Jul 16, 2015 at 10:30:48AM +0200, Teresa Remmet wrote:\n"
@@ -76,7 +65,7 @@
  "> +\t};\n"
  "> +\n"
  "> +\tcpus {\n"
- "> +\t\tcpu@0 {\n"
+ "> +\t\tcpu at 0 {\n"
  "> +\t\t\tcpu0-supply = <&vdd1_reg>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -86,7 +75,7 @@
  "> +\t\treg = <0x80000000 0x10000000>; /* 256 MB */\n"
  "> +\t};\n"
  "> +\n"
- "> +\tvbat: fixedregulator@0 {\n"
+ "> +\tvbat: fixedregulator at 0 {\n"
  "> +\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t};\n"
  "> +};\n"
@@ -163,18 +152,18 @@
  "> +\tclock-frequency = <400000>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\ttps: pmic@2d {\n"
+ "> +\ttps: pmic at 2d {\n"
  "> +\t\treg = <0x2d>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\ti2c_eeprom: eeprom@52 {\n"
+ "> +\ti2c_eeprom: eeprom at 52 {\n"
  "> +\t\tcompatible = \"atmel,24c32\";\n"
  "> +\t\tpagesize = <32>;\n"
  "> +\t\treg = <0x52>;\n"
  "> +\t\tstatus = \"disabled\";\n"
  "> +\t};\n"
  "> +\n"
- "> +\ti2c_rtc: rtc@68 {\n"
+ "> +\ti2c_rtc: rtc at 68 {\n"
  "> +\t\tcompatible = \"rv4162\";\n"
  "> +\t\treg = <0x68>;\n"
  "> +\t\tstatus = \"disabled\";\n"
@@ -212,7 +201,7 @@
  "> +\tpinctrl-names = \"default\";\n"
  "> +\tpinctrl-0 = <&nandflash_pins>;\n"
  "> +\tranges = <0 0 0x08000000 0x1000000>;   /* CS0: NAND */\n"
- "> +\tnandflash: nand@0,0 {\n"
+ "> +\tnandflash: nand at 0,0 {\n"
  "> +\t\treg = <0 0 4>; /* CS0, offset 0, IO size 4 */\n"
  "> +\t\tnand-bus-width = <8>;\n"
  "> +\t\tti,nand-ecc-opt = \"bch8\";\n"
@@ -247,39 +236,39 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\n"
- "> +\t\tpartition@0 {\n"
+ "> +\t\tpartition at 0 {\n"
  "> +\t\t\tlabel = \"xload\";\n"
  "> +\t\t\treg = <0x0 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@1 {\n"
+ "> +\t\tpartition at 1 {\n"
  "> +\t\t\tlabel = \"xload_backup1\";\n"
  "> +\t\t\treg = <0x20000 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@2 {\n"
+ "> +\t\tpartition at 2 {\n"
  "> +\t\t\tlabel = \"xload_backup2\";\n"
  "> +\t\t\treg = <0x40000 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@3 {\n"
+ "> +\t\tpartition at 3 {\n"
  "> +\t\t\tlabel = \"xload_backup3\";\n"
  "> +\t\t\treg = <0x60000 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@4 {\n"
+ "> +\t\tpartition at 4 {\n"
  "> +\t\t\tlabel = \"barebox\";\n"
  "> +\t\t\treg = <0x80000 0x80000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@5 {\n"
+ "> +\t\tpartition at 5 {\n"
  "> +\t\t\tlabel = \"bareboxenv\";\n"
  "> +\t\t\treg = <0x100000 0x40000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@6 {\n"
+ "> +\t\tpartition at 6 {\n"
  "> +\t\t\tlabel = \"oftree\";\n"
  "> +\t\t\treg = <0x140000 0x40000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@7 {\n"
+ "> +\t\tpartition at 7 {\n"
  "> +\t\t\tlabel = \"kernel\";\n"
  "> +\t\t\treg = <0x180000 0x800000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@8 {\n"
+ "> +\t\tpartition at 8 {\n"
  "> +\t\t\tlabel = \"root\";\n"
  "> +\t\t\treg = <0x980000 0x0>;\n"
  "> +\t\t};\n"
@@ -300,15 +289,15 @@
  "> +\tvccio-supply = <&vbat>;\n"
  "> +\n"
  "> +\tregulators {\n"
- "> +\t\tvrtc_reg: regulator@0 {\n"
+ "> +\t\tvrtc_reg: regulator at 0 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvio_reg: regulator@1 {\n"
+ "> +\t\tvio_reg: regulator at 1 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvdd1_reg: regulator@2 {\n"
+ "> +\t\tvdd1_reg: regulator at 2 {\n"
  "> +\t\t\t/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */\n"
  "> +\t\t\tregulator-name = \"vdd_mpu\";\n"
  "> +\t\t\tregulator-min-microvolt = <912500>;\n"
@@ -317,7 +306,7 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvdd2_reg: regulator@3 {\n"
+ "> +\t\tvdd2_reg: regulator at 3 {\n"
  "> +\t\t\t/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */\n"
  "> +\t\t\tregulator-name = \"vdd_core\";\n"
  "> +\t\t\tregulator-min-microvolt = <912500>;\n"
@@ -326,41 +315,41 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvdd3_reg: regulator@4 {\n"
+ "> +\t\tvdd3_reg: regulator at 4 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvdig1_reg: regulator@5 {\n"
+ "> +\t\tvdig1_reg: regulator at 5 {\n"
  "> +\t\t\tregulator-name = \"vdig1_1p8v\";\n"
  "> +\t\t\tregulator-min-microvolt = <1800000>;\n"
  "> +\t\t\tregulator-max-microvolt = <1800000>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvdig2_reg: regulator@6 {\n"
+ "> +\t\tvdig2_reg: regulator at 6 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvpll_reg: regulator@7 {\n"
+ "> +\t\tvpll_reg: regulator at 7 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvdac_reg: regulator@8 {\n"
+ "> +\t\tvdac_reg: regulator at 8 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvaux1_reg: regulator@9 {\n"
+ "> +\t\tvaux1_reg: regulator at 9 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvaux2_reg: regulator@10 {\n"
+ "> +\t\tvaux2_reg: regulator at 10 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvaux33_reg: regulator@11 {\n"
+ "> +\t\tvaux33_reg: regulator at 11 {\n"
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tvmmc_reg: regulator@12 {\n"
+ "> +\t\tvmmc_reg: regulator at 12 {\n"
  "> +\t\t\tregulator-min-microvolt = <3300000>;\n"
  "> +\t\t\tregulator-max-microvolt = <3300000>;\n"
  "> +\t\t\tregulator-always-on;\n"
@@ -392,7 +381,7 @@
  "> +\tpinctrl-0 = <&spi0_pins>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tserial_flash: m25p80@0 {\n"
+ "> +\tserial_flash: m25p80 at 0 {\n"
  "> +\t\tcompatible = \"m25p80\";\n"
  "> +\t\tspi-max-frequency = <48000000>;\n"
  "> +\t\treg = <0x0>;\n"
@@ -401,23 +390,23 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\n"
- "> +\t\tpartition@0 {\n"
+ "> +\t\tpartition at 0 {\n"
  "> +\t\t\tlabel = \"xload\";\n"
  "> +\t\t\treg = <0x0 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@1 {\n"
+ "> +\t\tpartition at 1 {\n"
  "> +\t\t\tlabel = \"barebox\";\n"
  "> +\t\t\treg = <0x20000 0x80000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@2 {\n"
+ "> +\t\tpartition at 2 {\n"
  "> +\t\t\tlabel = \"bareboxenv\";\n"
  "> +\t\t\treg = <0xa0000 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@3 {\n"
+ "> +\t\tpartition at 3 {\n"
  "> +\t\t\tlabel = \"oftree\";\n"
  "> +\t\t\treg = <0xc0000 0x20000>;\n"
  "> +\t\t};\n"
- "> +\t\tpartition@4 {\n"
+ "> +\t\tpartition at 4 {\n"
  "> +\t\t\tlabel = \"kernel\";\n"
  "> +\t\t\treg = <0xe0000 0x0>;\n"
  "> +\t\t};\n"
@@ -429,7 +418,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
 
-8a5e52429ec62e8095cae37e17022697b9fd01f5007abb07528b269bef4fd110
+3283d75a503008e610b08cc20144a0dad46a9708a858f8fde777b9089a53aec1
