diff for duplicates of <87a8b8gopf.fsf@free-electrons.com>

diff --git a/a/1.txt b/N1/1.txt
index e067ef7..de08395 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
 Hi Romain,
  
- On jeu., déc. 08 2016, Romain Perier <romain.perier@free-electrons.com> wrote:
+ On jeu., d?c. 08 2016, Romain Perier <romain.perier@free-electrons.com> wrote:
 
 > This commit enables the device node spi0 on the official development
 > board for the Marvell Armada 3700. It also adds sub-node for the 128Mb
@@ -33,7 +33,7 @@ Gregory
 > +&spi0 {
 > +	status = "okay";
 > +
-> +	m25p80@0 {
+> +	m25p80 at 0 {
 > +		compatible = "jedec,spi-nor";
 > +		reg = <0>;
 > +		spi-max-frequency = <108000000>;
@@ -44,15 +44,15 @@ Gregory
 > +			compatible = "fixed-partitions";
 > +			#address-cells = <1>;
 > +			#size-cells = <1>;
-> +			partition@0 {
+> +			partition at 0 {
 > +				label = "bootloader";
 > +				reg = <0x0 0x200000>;
 > +			};
-> +			partition@200000 {
+> +			partition at 200000 {
 > +				label = "U-boot Env";
 > +				reg = <0x200000 0x10000>;
 > +			};
-> +			partition@210000 {
+> +			partition at 210000 {
 > +				label = "Linux";
 > +				reg = <0x210000 0xDF0000>;
 > +			};
@@ -72,8 +72,3 @@ Gregory Clement, Free Electrons
 Kernel, drivers, real-time and embedded Linux
 development, consulting, training and support.
 http://free-electrons.com
-
-_______________________________________________
-linux-arm-kernel mailing list
-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 6cf784b..b02ac4e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,30 +1,14 @@
  "ref\020161208145847.7794-1-romain.perier@free-electrons.com\0"
  "ref\020161208145847.7794-5-romain.perier@free-electrons.com\0"
- "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0"
- "Subject\0Re: [PATCH v4 4/4] arm64: dts: marvell: Enable spi0 on the board Armada-3720-db\0"
+ "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
+ "Subject\0[PATCH v4 4/4] arm64: dts: marvell: Enable spi0 on the board Armada-3720-db\0"
  "Date\0Tue, 03 Jan 2017 16:14:52 +0100\0"
- "To\0Romain Perier <romain.perier@free-electrons.com>\0"
- "Cc\0Mark Rutland <mark.rutland@arm.com>"
-  Andrew Lunn <andrew@lunn.ch>
-  Jason Cooper <jason@lakedaemon.net>
-  Pawel Moll <pawel.moll@arm.com>
-  devicetree@vger.kernel.org
-  Ian Campbell <ijc+devicetree@hellion.org.uk>
-  Rob Herring <robh+dt@kernel.org>
-  linux-spi@vger.kernel.org
-  Nadav Haklai <nadavh@marvell.com>
-  Mark Brown <broonie@kernel.org>
-  Kumar Gala <galak@codeaurora.org>
-  xigu@marvell.com
-  dingwei@marvell.com
-  Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-  linux-arm-kernel@lists.infradead.org
- " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Romain,\n"
  " \n"
- " On jeu., d\303\251c. 08 2016, Romain Perier <romain.perier@free-electrons.com> wrote:\n"
+ " On jeu., d?c. 08 2016, Romain Perier <romain.perier@free-electrons.com> wrote:\n"
  "\n"
  "> This commit enables the device node spi0 on the official development\n"
  "> board for the Marvell Armada 3700. It also adds sub-node for the 128Mb\n"
@@ -57,7 +41,7 @@
  "> +&spi0 {\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tm25p80@0 {\n"
+ "> +\tm25p80 at 0 {\n"
  "> +\t\tcompatible = \"jedec,spi-nor\";\n"
  "> +\t\treg = <0>;\n"
  "> +\t\tspi-max-frequency = <108000000>;\n"
@@ -68,15 +52,15 @@
  "> +\t\t\tcompatible = \"fixed-partitions\";\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <1>;\n"
- "> +\t\t\tpartition@0 {\n"
+ "> +\t\t\tpartition at 0 {\n"
  "> +\t\t\t\tlabel = \"bootloader\";\n"
  "> +\t\t\t\treg = <0x0 0x200000>;\n"
  "> +\t\t\t};\n"
- "> +\t\t\tpartition@200000 {\n"
+ "> +\t\t\tpartition at 200000 {\n"
  "> +\t\t\t\tlabel = \"U-boot Env\";\n"
  "> +\t\t\t\treg = <0x200000 0x10000>;\n"
  "> +\t\t\t};\n"
- "> +\t\t\tpartition@210000 {\n"
+ "> +\t\t\tpartition at 210000 {\n"
  "> +\t\t\t\tlabel = \"Linux\";\n"
  "> +\t\t\t\treg = <0x210000 0xDF0000>;\n"
  "> +\t\t\t};\n"
@@ -95,11 +79,6 @@
  "Gregory Clement, Free Electrons\n"
  "Kernel, drivers, real-time and embedded Linux\n"
  "development, consulting, training and support.\n"
- "http://free-electrons.com\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ http://free-electrons.com
 
-6121451e681cfe86c475133c2c6e3e008350a33c8ad9d9c548cae799f0700a38
+ed017992d569a2d87ffab2dacf0e8196a543c0727a1390191f8101c761bc5f01
