diff for duplicates of <54D961A7.8080109@atmel.com>

diff --git a/a/1.txt b/N1/1.txt
index a8845e5..e9aa977 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,7 +6,7 @@ On 2/10/2015 2:10 AM, Alexandre Belloni wrote:
 > On 09/02/2015 at 17:17:03 +0800, Josh Wu wrote :
 >> Add at91 sama5d4 xplained board support.
 >>
->> Signed-off-by: Josh Wu <josh.wu@atmel.com>
+>> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
 >> ---
 >>
 >> Changes in v2:
@@ -48,7 +48,7 @@ Josh Wu
 >> + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board
 >> + *
 >> + *  Copyright (C) 2015 Atmel,
->> + *                2015 Josh Wu <josh.wu@atmel.com>
+>> + *                2015 Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
 >> + *
 >> + * This file is dual-licensed: you can use it either under the terms
 >> + * of the GPL or the X11 license, at your option. Note that this dual
@@ -108,7 +108,7 @@ Josh Wu
 >> +		#size-cells = <1>;
 >> +		ranges;
 >> +
->> +		main_clock: clock at 0 {
+>> +		main_clock: clock@0 {
 >> +			compatible = "atmel,osc", "fixed-clock";
 >> +			clock-frequency = <12000000>;
 >> +		};
@@ -124,50 +124,50 @@ Josh Wu
 >> +
 >> +	ahb {
 >> +		apb {
->> +			spi0: spi at f8010000 {
+>> +			spi0: spi@f8010000 {
 >> +				cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
 >> +				status = "okay";
->> +				m25p80 at 0 {
+>> +				m25p80@0 {
 >> +					compatible = "atmel,at25df321a";
 >> +					spi-max-frequency = <50000000>;
 >> +					reg = <0>;
 >> +				};
 >> +			};
 >> +
->> +			macb0: ethernet at f8020000 {
+>> +			macb0: ethernet@f8020000 {
 >> +				phy-mode = "rmii";
 >> +				status = "okay";
 >> +			};
 >> +
->> +			mmc1: mmc at fc000000 {
+>> +			mmc1: mmc@fc000000 {
 >> +				pinctrl-names = "default";
 >> +				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
 >> +				status = "okay";
->> +				slot at 0 {
+>> +				slot@0 {
 >> +					reg = <0>;
 >> +					bus-width = <4>;
 >> +					cd-gpios = <&pioE 3 0>;
 >> +				};
 >> +			};
 >> +
->> +			usart3: serial at fc00c000 {
+>> +			usart3: serial@fc00c000 {
 >> +				status = "okay";
 >> +			};
 >> +
->> +			usart4: serial at fc010000 {
+>> +			usart4: serial@fc010000 {
 >> +				status = "okay";
 >> +			};
 >> +
->> +			adc0: adc at fc034000 {
+>> +			adc0: adc@fc034000 {
 >> +				atmel,adc-vref = <3300>;
 >> +				status = "okay";
 >> +			};
 >> +
->> +			watchdog at fc068640 {
+>> +			watchdog@fc068640 {
 >> +				status = "okay";
 >> +			};
 >> +
->> +			pinctrl at fc06a000 {
+>> +			pinctrl@fc06a000 {
 >> +				board {
 >> +					pinctrl_mmc1_cd: mmc1_cd {
 >> +						atmel,pins =
@@ -185,14 +185,14 @@ Josh Wu
 >> +			};
 >> +		};
 >> +
->> +		usb0: gadget at 00400000 {
+>> +		usb0: gadget@00400000 {
 >> +			atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;
 >> +			pinctrl-names = "default";
 >> +			pinctrl-0 = <&pinctrl_usba_vbus>;
 >> +			status = "okay";
 >> +		};
 >> +
->> +		usb1: ohci at 00500000 {
+>> +		usb1: ohci@00500000 {
 >> +			num-ports = <3>;
 >> +			atmel,vbus-gpio = <0
 >> +					   &pioE 11 GPIO_ACTIVE_HIGH
@@ -201,43 +201,43 @@ Josh Wu
 >> +			status = "okay";
 >> +		};
 >> +
->> +		usb2: ehci at 00600000 {
+>> +		usb2: ehci@00600000 {
 >> +			status = "okay";
 >> +		};
 >> +
->> +		nand0: nand at 80000000 {
+>> +		nand0: nand@80000000 {
 >> +			nand-bus-width = <8>;
 >> +			nand-ecc-mode = "hw";
 >> +			nand-on-flash-bbt;
 >> +			atmel,has-pmecc;
 >> +			status = "okay";
 >> +
->> +			at91bootstrap at 0 {
+>> +			at91bootstrap@0 {
 >> +				label = "at91bootstrap";
 >> +				reg = <0x0 0x40000>;
 >> +			};
 >> +
->> +			bootloader at 40000 {
+>> +			bootloader@40000 {
 >> +				label = "bootloader";
 >> +				reg = <0x40000 0x80000>;
 >> +			};
 >> +
->> +			bootloaderenv at c0000 {
+>> +			bootloaderenv@c0000 {
 >> +				label = "bootloader env";
 >> +				reg = <0xc0000 0xc0000>;
 >> +			};
 >> +
->> +			dtb at 180000 {
+>> +			dtb@180000 {
 >> +				label = "device tree";
 >> +				reg = <0x180000 0x80000>;
 >> +			};
 >> +
->> +			kernel at 200000 {
+>> +			kernel@200000 {
 >> +				label = "kernel";
 >> +				reg = <0x200000 0x600000>;
 >> +			};
 >> +
->> +			rootfs at 800000 {
+>> +			rootfs@800000 {
 >> +				label = "rootfs";
 >> +				reg = <0x800000 0x0f800000>;
 >> +			};
@@ -282,5 +282,10 @@ Josh Wu
 >>
 >> _______________________________________________
 >> linux-arm-kernel mailing list
->> linux-arm-kernel at lists.infradead.org
+>> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
 >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index f565f2b..a5d275b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,23 @@
  "ref\01423473423-17798-1-git-send-email-josh.wu@atmel.com\0"
  "ref\020150209181039.GQ3715@piout.net\0"
- "From\0josh.wu@atmel.com (Josh Wu)\0"
- "Subject\0[PATCH v2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board\0"
+ "ref\020150209181039.GQ3715-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org\0"
+ "From\0Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board\0"
  "Date\0Tue, 10 Feb 2015 09:40:55 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0"
+ "Cc\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>"
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+  Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
+  Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
+  Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
+  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
+  Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+  Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
+  Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org>
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "Hi, Alexandre\n"
@@ -14,7 +28,7 @@
  "> On 09/02/2015 at 17:17:03 +0800, Josh Wu wrote :\n"
  ">> Add at91 sama5d4 xplained board support.\n"
  ">>\n"
- ">> Signed-off-by: Josh Wu <josh.wu@atmel.com>\n"
+ ">> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n"
  ">> ---\n"
  ">>\n"
  ">> Changes in v2:\n"
@@ -56,7 +70,7 @@
  ">> + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board\n"
  ">> + *\n"
  ">> + *  Copyright (C) 2015 Atmel,\n"
- ">> + *                2015 Josh Wu <josh.wu@atmel.com>\n"
+ ">> + *                2015 Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n"
  ">> + *\n"
  ">> + * This file is dual-licensed: you can use it either under the terms\n"
  ">> + * of the GPL or the X11 license, at your option. Note that this dual\n"
@@ -116,7 +130,7 @@
  ">> +\t\t#size-cells = <1>;\n"
  ">> +\t\tranges;\n"
  ">> +\n"
- ">> +\t\tmain_clock: clock at 0 {\n"
+ ">> +\t\tmain_clock: clock@0 {\n"
  ">> +\t\t\tcompatible = \"atmel,osc\", \"fixed-clock\";\n"
  ">> +\t\t\tclock-frequency = <12000000>;\n"
  ">> +\t\t};\n"
@@ -132,50 +146,50 @@
  ">> +\n"
  ">> +\tahb {\n"
  ">> +\t\tapb {\n"
- ">> +\t\t\tspi0: spi at f8010000 {\n"
+ ">> +\t\t\tspi0: spi@f8010000 {\n"
  ">> +\t\t\t\tcs-gpios = <&pioC 3 0>, <0>, <0>, <0>;\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
- ">> +\t\t\t\tm25p80 at 0 {\n"
+ ">> +\t\t\t\tm25p80@0 {\n"
  ">> +\t\t\t\t\tcompatible = \"atmel,at25df321a\";\n"
  ">> +\t\t\t\t\tspi-max-frequency = <50000000>;\n"
  ">> +\t\t\t\t\treg = <0>;\n"
  ">> +\t\t\t\t};\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tmacb0: ethernet at f8020000 {\n"
+ ">> +\t\t\tmacb0: ethernet@f8020000 {\n"
  ">> +\t\t\t\tphy-mode = \"rmii\";\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tmmc1: mmc at fc000000 {\n"
+ ">> +\t\t\tmmc1: mmc@fc000000 {\n"
  ">> +\t\t\t\tpinctrl-names = \"default\";\n"
  ">> +\t\t\t\tpinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
- ">> +\t\t\t\tslot at 0 {\n"
+ ">> +\t\t\t\tslot@0 {\n"
  ">> +\t\t\t\t\treg = <0>;\n"
  ">> +\t\t\t\t\tbus-width = <4>;\n"
  ">> +\t\t\t\t\tcd-gpios = <&pioE 3 0>;\n"
  ">> +\t\t\t\t};\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tusart3: serial at fc00c000 {\n"
+ ">> +\t\t\tusart3: serial@fc00c000 {\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tusart4: serial at fc010000 {\n"
+ ">> +\t\t\tusart4: serial@fc010000 {\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tadc0: adc at fc034000 {\n"
+ ">> +\t\t\tadc0: adc@fc034000 {\n"
  ">> +\t\t\t\tatmel,adc-vref = <3300>;\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\twatchdog at fc068640 {\n"
+ ">> +\t\t\twatchdog@fc068640 {\n"
  ">> +\t\t\t\tstatus = \"okay\";\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tpinctrl at fc06a000 {\n"
+ ">> +\t\t\tpinctrl@fc06a000 {\n"
  ">> +\t\t\t\tboard {\n"
  ">> +\t\t\t\t\tpinctrl_mmc1_cd: mmc1_cd {\n"
  ">> +\t\t\t\t\t\tatmel,pins =\n"
@@ -193,14 +207,14 @@
  ">> +\t\t\t};\n"
  ">> +\t\t};\n"
  ">> +\n"
- ">> +\t\tusb0: gadget at 00400000 {\n"
+ ">> +\t\tusb0: gadget@00400000 {\n"
  ">> +\t\t\tatmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;\n"
  ">> +\t\t\tpinctrl-names = \"default\";\n"
  ">> +\t\t\tpinctrl-0 = <&pinctrl_usba_vbus>;\n"
  ">> +\t\t\tstatus = \"okay\";\n"
  ">> +\t\t};\n"
  ">> +\n"
- ">> +\t\tusb1: ohci at 00500000 {\n"
+ ">> +\t\tusb1: ohci@00500000 {\n"
  ">> +\t\t\tnum-ports = <3>;\n"
  ">> +\t\t\tatmel,vbus-gpio = <0\n"
  ">> +\t\t\t\t\t   &pioE 11 GPIO_ACTIVE_HIGH\n"
@@ -209,43 +223,43 @@
  ">> +\t\t\tstatus = \"okay\";\n"
  ">> +\t\t};\n"
  ">> +\n"
- ">> +\t\tusb2: ehci at 00600000 {\n"
+ ">> +\t\tusb2: ehci@00600000 {\n"
  ">> +\t\t\tstatus = \"okay\";\n"
  ">> +\t\t};\n"
  ">> +\n"
- ">> +\t\tnand0: nand at 80000000 {\n"
+ ">> +\t\tnand0: nand@80000000 {\n"
  ">> +\t\t\tnand-bus-width = <8>;\n"
  ">> +\t\t\tnand-ecc-mode = \"hw\";\n"
  ">> +\t\t\tnand-on-flash-bbt;\n"
  ">> +\t\t\tatmel,has-pmecc;\n"
  ">> +\t\t\tstatus = \"okay\";\n"
  ">> +\n"
- ">> +\t\t\tat91bootstrap at 0 {\n"
+ ">> +\t\t\tat91bootstrap@0 {\n"
  ">> +\t\t\t\tlabel = \"at91bootstrap\";\n"
  ">> +\t\t\t\treg = <0x0 0x40000>;\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tbootloader at 40000 {\n"
+ ">> +\t\t\tbootloader@40000 {\n"
  ">> +\t\t\t\tlabel = \"bootloader\";\n"
  ">> +\t\t\t\treg = <0x40000 0x80000>;\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tbootloaderenv at c0000 {\n"
+ ">> +\t\t\tbootloaderenv@c0000 {\n"
  ">> +\t\t\t\tlabel = \"bootloader env\";\n"
  ">> +\t\t\t\treg = <0xc0000 0xc0000>;\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tdtb at 180000 {\n"
+ ">> +\t\t\tdtb@180000 {\n"
  ">> +\t\t\t\tlabel = \"device tree\";\n"
  ">> +\t\t\t\treg = <0x180000 0x80000>;\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tkernel at 200000 {\n"
+ ">> +\t\t\tkernel@200000 {\n"
  ">> +\t\t\t\tlabel = \"kernel\";\n"
  ">> +\t\t\t\treg = <0x200000 0x600000>;\n"
  ">> +\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\trootfs at 800000 {\n"
+ ">> +\t\t\trootfs@800000 {\n"
  ">> +\t\t\t\tlabel = \"rootfs\";\n"
  ">> +\t\t\t\treg = <0x800000 0x0f800000>;\n"
  ">> +\t\t\t};\n"
@@ -290,7 +304,12 @@
  ">>\n"
  ">> _______________________________________________\n"
  ">> linux-arm-kernel mailing list\n"
- ">> linux-arm-kernel at lists.infradead.org\n"
- >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ ">> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ ">> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
+ "\n"
+ "--\n"
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
+ More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-2e7797c7724c4cf7502f6d8c7e00c09ce45af0a4c6c9fc80e9cfccc0e170720f
+c825613b9c16e73fc3381fa9a8e875235952159e974ef5ee25b605bd9eb11440
