diff for duplicates of <569F6C1E.8000006@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 8b845c9..13b7ece 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -92,7 +92,7 @@ On 15/01/16 15:54, Jean-Francois Moine wrote:
 > +
 > +Example:
 > +
-> +	de: de-controller@01000000 {
+> +	de: de-controller at 01000000 {
 > +		compatible = "allwinner,sun8i-h3-display-engine";
 > +		...
 > +		clocks = <&bus_gates 44>, <&de_clk>;
@@ -101,7 +101,7 @@ On 15/01/16 15:54, Jean-Francois Moine wrote:
 > +		ports = <&lcd0_p>;
 > +	};
 > +
-> +	lcd0: lcd-controller@01c0c000 {
+> +	lcd0: lcd-controller at 01c0c000 {
 > +		compatible = "allwinner,sun8i-h3-lcd";
 > +		...
 > +		clocks = <&bus_gates 35>, <&tcon0_clk>;
@@ -116,7 +116,7 @@ On 15/01/16 15:54, Jean-Francois Moine wrote:
 > +		};
 > +	};
 > +
-> +	hdmi: hdmi@01ee0000 {
+> +	hdmi: hdmi at 01ee0000 {
 > +		...
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
@@ -677,7 +677,7 @@ Andre.
 > +#ifndef __DE2_DRM_H__
 > +#define __DE2_DRM_H__
 > +/*
-> + * Copyright (C) 2016 Jean-FranÃ§ois Moine
+> + * Copyright (C) 2016 Jean-Fran??ois Moine
 > + *
 > + * This program is free software; you can redistribute it and/or
 > + * modify it under the terms of the GNU General Public License as
@@ -1236,6 +1236,6 @@ Andre.
 > 
 > _______________________________________________
 > 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 8fe7a91..888797b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,9 @@
  "ref\0cover.1452876522.git.moinejf@free.fr\0"
  "ref\04c40052b27f74df1342e631cb0f9ed5993861a54.1452876522.git.moinejf@free.fr\0"
- "From\0Andre Przywara <andre.przywara@arm.com>\0"
- "Subject\0Re: [PATCH v2 2/2] drm: sunxi: Add a basic DRM driver for Allwinner DE2\0"
+ "From\0andre.przywara@arm.com (Andre Przywara)\0"
+ "Subject\0[PATCH v2 2/2] drm: sunxi: Add a basic DRM driver for Allwinner DE2\0"
  "Date\0Wed, 20 Jan 2016 11:14:38 +0000\0"
- "To\0Jean-Francois Moine <moinejf@free.fr>"
-  Dave Airlie <airlied@linux.ie>
-  Chen-Yu Tsai <wens@csie.org>
- " Emilio L\303\263pez <emilio@elopez.com.ar>"
-  Maxime Ripard <maxime.ripard@free-electrons.com>
-  Michael Turquette <mturquette@baylibre.com>
- " Stephen Boyd <sboyd@codeaurora.org>\0"
- "Cc\0linux-arm-kernel@lists.infradead.org"
-  dri-devel@lists.freedesktop.org
- " linux-clk@vger.kernel.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Jean-Francois,\n"
@@ -109,7 +100,7 @@
  "> +\n"
  "> +Example:\n"
  "> +\n"
- "> +\tde: de-controller@01000000 {\n"
+ "> +\tde: de-controller at 01000000 {\n"
  "> +\t\tcompatible = \"allwinner,sun8i-h3-display-engine\";\n"
  "> +\t\t...\n"
  "> +\t\tclocks = <&bus_gates 44>, <&de_clk>;\n"
@@ -118,7 +109,7 @@
  "> +\t\tports = <&lcd0_p>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tlcd0: lcd-controller@01c0c000 {\n"
+ "> +\tlcd0: lcd-controller at 01c0c000 {\n"
  "> +\t\tcompatible = \"allwinner,sun8i-h3-lcd\";\n"
  "> +\t\t...\n"
  "> +\t\tclocks = <&bus_gates 35>, <&tcon0_clk>;\n"
@@ -133,7 +124,7 @@
  "> +\t\t};\n"
  "> +\t};\n"
  "> +\n"
- "> +\thdmi: hdmi@01ee0000 {\n"
+ "> +\thdmi: hdmi at 01ee0000 {\n"
  "> +\t\t...\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
@@ -694,7 +685,7 @@
  "> +#ifndef __DE2_DRM_H__\n"
  "> +#define __DE2_DRM_H__\n"
  "> +/*\n"
- "> + * Copyright (C) 2016 Jean-Fran\303\203\302\247ois Moine\n"
+ "> + * Copyright (C) 2016 Jean-Fran??ois Moine\n"
  "> + *\n"
  "> + * This program is free software; you can redistribute it and/or\n"
  "> + * modify it under the terms of the GNU General Public License as\n"
@@ -1253,8 +1244,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"
  >
 
-623e99517447c106e837689808344ea641820cd5958aaf22f29e5ee0af812a6f
+f167c8fa6ab01fa7665725501e7d6140b307ff06a25908a09abc04711045cefd
