diff for duplicates of <8760rrm58e.fsf@free-electrons.com>

diff --git a/a/1.txt b/N1/1.txt
index b16023f..44e3b89 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -29,7 +29,7 @@ Gregory
 >> +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
 >> @@ -182,15 +182,35 @@
 >>  
->>  			nfc: flash at d0000 {
+>>  			nfc: flash@d0000 {
 >>  				status = "okay";
 >> -				#address-cells = <1>;
 >> -				#size-cells = <1>;
@@ -46,26 +46,26 @@ Gregory
 >> +					#address-cells = <1>;
 >> +					#size-cells = <1>;
 >> +
->> +					partition at 0 {
+>> +					partition@0 {
 >> +						label = "U-Boot";
 >> +						reg = <0x00000000 0x00800000>;
 >> +						read-only;
 >> +					};
 >> +
->> +					partition at 800000 {
+>> +					partition@800000 {
 >> +						label = "uImage";
 >> +						reg = <0x00800000 0x00400000>;
 >> +						read-only;
 >> +					};
 >> +
->> +					partition at c00000 {
+>> +					partition@c00000 {
 >> +						label = "Root";
 >> +						reg = <0x00c00000 0x3f400000>;
 >> +					};
 >> +				};
 >>  			};
 >>  
->>  			usb3 at f0000 {
+>>  			usb3@f0000 {
 >> -- 
 >> 1.8.3.1
 >>
@@ -78,7 +78,7 @@ Gregory
 >
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
 -- 
diff --git a/a/content_digest b/N1/content_digest
index d7127a0..0e5ef4c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,22 @@
  "ref\01469105055-25181-1-git-send-email-jaz@semihalf.com\0"
  "ref\01469105055-25181-6-git-send-email-jaz@semihalf.com\0"
  "ref\087k2g7m5j1.fsf@free-electrons.com\0"
- "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
- "Subject\0[PATCH 05/18] ARM: mvebu: a385-db-ap: add default partition description for NAND\0"
+ "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0"
+ "Subject\0Re: [PATCH 05/18] ARM: mvebu: a385-db-ap: add default partition description for NAND\0"
  "Date\0Wed, 27 Jul 2016 18:10:41 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Grzegorz Jaszczyk <jaz@semihalf.com>\0"
+ "Cc\0mark.rutland@arm.com"
+  devicetree@vger.kernel.org
+  jason@lakedaemon.net
+  andrew@lunn.ch
+  linux-kernel@vger.kernel.org
+  linux@armlinux.org.uk
+  alior@marvell.com
+  robh+dt@kernel.org
+  mw@semihalf.com
+  thomas.petazzoni@free-electrons.com
+  linux-arm-kernel@lists.infradead.org
+ " sebastian.hesselbarth@gmail.com\0"
  "\00:1\0"
  "b\0"
  "Hi,\n"
@@ -38,7 +50,7 @@
  ">> +++ b/arch/arm/boot/dts/armada-385-db-ap.dts\n"
  ">> @@ -182,15 +182,35 @@\n"
  ">>  \n"
- ">>  \t\t\tnfc: flash at d0000 {\n"
+ ">>  \t\t\tnfc: flash@d0000 {\n"
  ">>  \t\t\t\tstatus = \"okay\";\n"
  ">> -\t\t\t\t#address-cells = <1>;\n"
  ">> -\t\t\t\t#size-cells = <1>;\n"
@@ -55,26 +67,26 @@
  ">> +\t\t\t\t\t#address-cells = <1>;\n"
  ">> +\t\t\t\t\t#size-cells = <1>;\n"
  ">> +\n"
- ">> +\t\t\t\t\tpartition at 0 {\n"
+ ">> +\t\t\t\t\tpartition@0 {\n"
  ">> +\t\t\t\t\t\tlabel = \"U-Boot\";\n"
  ">> +\t\t\t\t\t\treg = <0x00000000 0x00800000>;\n"
  ">> +\t\t\t\t\t\tread-only;\n"
  ">> +\t\t\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\t\t\tpartition at 800000 {\n"
+ ">> +\t\t\t\t\tpartition@800000 {\n"
  ">> +\t\t\t\t\t\tlabel = \"uImage\";\n"
  ">> +\t\t\t\t\t\treg = <0x00800000 0x00400000>;\n"
  ">> +\t\t\t\t\t\tread-only;\n"
  ">> +\t\t\t\t\t};\n"
  ">> +\n"
- ">> +\t\t\t\t\tpartition at c00000 {\n"
+ ">> +\t\t\t\t\tpartition@c00000 {\n"
  ">> +\t\t\t\t\t\tlabel = \"Root\";\n"
  ">> +\t\t\t\t\t\treg = <0x00c00000 0x3f400000>;\n"
  ">> +\t\t\t\t\t};\n"
  ">> +\t\t\t\t};\n"
  ">>  \t\t\t};\n"
  ">>  \n"
- ">>  \t\t\tusb3 at f0000 {\n"
+ ">>  \t\t\tusb3@f0000 {\n"
  ">> -- \n"
  ">> 1.8.3.1\n"
  ">>\n"
@@ -87,7 +99,7 @@
  ">\n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "\n"
  "-- \n"
@@ -96,4 +108,4 @@
  "development, consulting, training and support.\n"
  http://free-electrons.com
 
-6606be0078a0bd0630777370e54fd4ffb9b9526d326be39f3bf96d06c39cb221
+743a85444acbea86a655c183d3c10c57b0de78894af6b23012bc5d1f169a06f4
