diff for duplicates of <20160331061023.GO28207@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 6be136d..b32303c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa?mann wrote:
+On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Waßmann wrote:
 > Add support for the following i.MX6 based modules from Ka-Ro
 > electronics GmbH:
 > TX6S-8034:
@@ -7,7 +7,7 @@ On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa?mann wrote:
 > ROM          128MiB NAND Flash
 > Power supply Single 3.1V to 5.5V
 > Size         31mm SO-DIMM
-> Temp. Range  industrial grade (-40?C/-25?C to 105?C Tj)
+> Temp. Range  industrial grade (-40°C/-25°C to 105°C Tj)
 > 
 > TX6S-8035:
 > Processor    Freescale i.MX 6 Solo, 800MHz
@@ -15,7 +15,7 @@ On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa?mann wrote:
 > ROM          4GiB eMMC
 > Power supply Single 3.1V to 5.5V
 > Size         31mm SO-DIMM
-> Temp. Range  industrial grade (-40?C/-25?C to 105?C Tj)
+> Temp. Range  industrial grade (-40°C/-25°C to 105°C Tj)
 > 
 > TX6U-8033:
 > Processor    Freescale i.MX 6 Dual Lite, 800MHz
@@ -23,7 +23,7 @@ On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa?mann wrote:
 > ROM          4GiB eMMC
 > Power supply Single 3.1V to 5.5V
 > Size         31mm SO-DIMM
-> Temp. Range  industrial grade (-40?C/-25?C to 105?C Tj)
+> Temp. Range  industrial grade (-40°C/-25°C to 105°C Tj)
 > 
 > TX6Q-1036:
 > Processor    Freescale i.MX 6Quad, 1GHz
@@ -31,9 +31,9 @@ On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa?mann wrote:
 > ROM          8GiB eMMC
 > Power supply Single 3.1V to 5.5V
 > Size         31mm SO-DIMM
-> Temp. Range  Extended Consumer Grade (-20?C to 105?C Tj)
+> Temp. Range  Extended Consumer Grade (-20°C to 105°C Tj)
 > 
-> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
+> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
 > ---
 >  arch/arm/boot/dts/Makefile             |   4 +
 >  arch/arm/boot/dts/imx6dl-tx6s-8034.dts | 249 ++++++++++++++++++++++++++++
@@ -80,7 +80,7 @@ Shawn
 > +++ b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
 > @@ -0,0 +1,237 @@
 > +/*
-> + * Copyright 2015-2016 Lothar Wa?mann <LW@KARO-electronics.de>
+> + * Copyright 2015-2016 Lothar Waßmann <LW@KARO-electronics.de>
 > + *
 > + * 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
@@ -134,7 +134,7 @@ Shawn
 > +	};
 > +
 > +	cpus {
-> +		/delete-node/ cpu at 1;
+> +		/delete-node/ cpu@1;
 > +	};
 > +
 > +	backlight: backlight {
@@ -162,7 +162,7 @@ Shawn
 > +		default-brightness-level = <50>;
 > +	};
 > +
-> +	display: display at di0 {
+> +	display: display@di0 {
 > +		compatible = "fsl,imx-parallel-display";
 > +		pinctrl-names = "default";
 > +		pinctrl-0 = <&pinctrl_disp0_2>;
@@ -323,7 +323,7 @@ Shawn
 > +++ b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
 > @@ -0,0 +1,253 @@
 > +/*
-> + * Copyright 2015-2016 Lothar Wa?mann <LW@KARO-electronics.de>
+> + * Copyright 2015-2016 Lothar Waßmann <LW@KARO-electronics.de>
 > + *
 > + * 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
@@ -377,7 +377,7 @@ Shawn
 > +	};
 > +
 > +	cpus {
-> +		/delete-node/ cpu at 1;
+> +		/delete-node/ cpu@1;
 > +	};
 > +
 > +	backlight: backlight {
@@ -405,7 +405,7 @@ Shawn
 > +		default-brightness-level = <50>;
 > +	};
 > +
-> +	display: display at di0 {
+> +	display: display@di0 {
 > +		compatible = "fsl,imx-parallel-display";
 > +		pinctrl-names = "default";
 > +		pinctrl-0 = <&pinctrl_disp0_2>;
@@ -582,7 +582,7 @@ Shawn
 > +++ b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
 > @@ -0,0 +1,248 @@
 > +/*
-> + * Copyright 2014-2016 Lothar Wa?mann <LW@KARO-electronics.de>
+> + * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
 > + *
 > + * 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
@@ -659,7 +659,7 @@ Shawn
 > +		default-brightness-level = <50>;
 > +	};
 > +
-> +	display: display at di0 {
+> +	display: display@di0 {
 > +		compatible = "fsl,imx-parallel-display";
 > +		pinctrl-names = "default";
 > +		pinctrl-0 = <&pinctrl_disp0_2>;
@@ -836,7 +836,7 @@ Shawn
 > +++ b/arch/arm/boot/dts/imx6q-tx6q-1036.dts
 > @@ -0,0 +1,252 @@
 > +/*
-> + * Copyright 2014-2016 Lothar Wa?mann <LW@KARO-electronics.de>
+> + * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
 > + *
 > + * 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
@@ -913,7 +913,7 @@ Shawn
 > +		default-brightness-level = <50>;
 > +	};
 > +
-> +	display: display at di0 {
+> +	display: display@di0 {
 > +		compatible = "fsl,imx-parallel-display";
 > +		pinctrl-names = "default";
 > +		pinctrl-0 = <&pinctrl_disp0_2>;
@@ -1092,5 +1092,5 @@ Shawn
 > 
 > _______________________________________________
 > 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 dd3541f..aac3031 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,12 +1,25 @@
  "ref\01457424244-14549-1-git-send-email-LW@KARO-electronics.de\0"
  "ref\01457424244-14549-8-git-send-email-LW@KARO-electronics.de\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCHv2 7/8] ARM: dts: imx6: add support for more Ka-Ro electronics modules\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCHv2 7/8] ARM: dts: imx6: add support for more Ka-Ro electronics modules\0"
  "Date\0Thu, 31 Mar 2016 14:10:23 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Lothar Wa\303\237mann <LW@karo-electronics.de>\0"
+ "Cc\0Dan Williams <dan.j.williams@intel.com>"
+  Ian Campbell <ijc+devicetree@hellion.org.uk>
+  Kumar Gala <galak@codeaurora.org>
+  Mark Rutland <mark.rutland@arm.com>
+  Pawel Moll <pawel.moll@arm.com>
+  Rob Herring <robh+dt@kernel.org>
+  Russell King <linux@arm.linux.org.uk>
+  Sascha Hauer <kernel@pengutronix.de>
+  Vinod Koul <vinod.koul@intel.com>
+  devicetree@vger.kernel.org
+  dmaengine@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
- "On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa?mann wrote:\n"
+ "On Tue, Mar 08, 2016 at 09:04:03AM +0100, Lothar Wa\303\237mann wrote:\n"
  "> Add support for the following i.MX6 based modules from Ka-Ro\n"
  "> electronics GmbH:\n"
  "> TX6S-8034:\n"
@@ -15,7 +28,7 @@
  "> ROM          128MiB NAND Flash\n"
  "> Power supply Single 3.1V to 5.5V\n"
  "> Size         31mm SO-DIMM\n"
- "> Temp. Range  industrial grade (-40?C/-25?C to 105?C Tj)\n"
+ "> Temp. Range  industrial grade (-40\302\260C/-25\302\260C to 105\302\260C Tj)\n"
  "> \n"
  "> TX6S-8035:\n"
  "> Processor    Freescale i.MX 6 Solo, 800MHz\n"
@@ -23,7 +36,7 @@
  "> ROM          4GiB eMMC\n"
  "> Power supply Single 3.1V to 5.5V\n"
  "> Size         31mm SO-DIMM\n"
- "> Temp. Range  industrial grade (-40?C/-25?C to 105?C Tj)\n"
+ "> Temp. Range  industrial grade (-40\302\260C/-25\302\260C to 105\302\260C Tj)\n"
  "> \n"
  "> TX6U-8033:\n"
  "> Processor    Freescale i.MX 6 Dual Lite, 800MHz\n"
@@ -31,7 +44,7 @@
  "> ROM          4GiB eMMC\n"
  "> Power supply Single 3.1V to 5.5V\n"
  "> Size         31mm SO-DIMM\n"
- "> Temp. Range  industrial grade (-40?C/-25?C to 105?C Tj)\n"
+ "> Temp. Range  industrial grade (-40\302\260C/-25\302\260C to 105\302\260C Tj)\n"
  "> \n"
  "> TX6Q-1036:\n"
  "> Processor    Freescale i.MX 6Quad, 1GHz\n"
@@ -39,9 +52,9 @@
  "> ROM          8GiB eMMC\n"
  "> Power supply Single 3.1V to 5.5V\n"
  "> Size         31mm SO-DIMM\n"
- "> Temp. Range  Extended Consumer Grade (-20?C to 105?C Tj)\n"
+ "> Temp. Range  Extended Consumer Grade (-20\302\260C to 105\302\260C Tj)\n"
  "> \n"
- "> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>\n"
+ "> Signed-off-by: Lothar Wa\303\237mann <LW@KARO-electronics.de>\n"
  "> ---\n"
  ">  arch/arm/boot/dts/Makefile             |   4 +\n"
  ">  arch/arm/boot/dts/imx6dl-tx6s-8034.dts | 249 ++++++++++++++++++++++++++++\n"
@@ -88,7 +101,7 @@
  "> +++ b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts\n"
  "> @@ -0,0 +1,237 @@\n"
  "> +/*\n"
- "> + * Copyright 2015-2016 Lothar Wa?mann <LW@KARO-electronics.de>\n"
+ "> + * Copyright 2015-2016 Lothar Wa\303\237mann <LW@KARO-electronics.de>\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"
@@ -142,7 +155,7 @@
  "> +\t};\n"
  "> +\n"
  "> +\tcpus {\n"
- "> +\t\t/delete-node/ cpu at 1;\n"
+ "> +\t\t/delete-node/ cpu@1;\n"
  "> +\t};\n"
  "> +\n"
  "> +\tbacklight: backlight {\n"
@@ -170,7 +183,7 @@
  "> +\t\tdefault-brightness-level = <50>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tdisplay: display at di0 {\n"
+ "> +\tdisplay: display@di0 {\n"
  "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n"
  "> +\t\tpinctrl-names = \"default\";\n"
  "> +\t\tpinctrl-0 = <&pinctrl_disp0_2>;\n"
@@ -331,7 +344,7 @@
  "> +++ b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts\n"
  "> @@ -0,0 +1,253 @@\n"
  "> +/*\n"
- "> + * Copyright 2015-2016 Lothar Wa?mann <LW@KARO-electronics.de>\n"
+ "> + * Copyright 2015-2016 Lothar Wa\303\237mann <LW@KARO-electronics.de>\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"
@@ -385,7 +398,7 @@
  "> +\t};\n"
  "> +\n"
  "> +\tcpus {\n"
- "> +\t\t/delete-node/ cpu at 1;\n"
+ "> +\t\t/delete-node/ cpu@1;\n"
  "> +\t};\n"
  "> +\n"
  "> +\tbacklight: backlight {\n"
@@ -413,7 +426,7 @@
  "> +\t\tdefault-brightness-level = <50>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tdisplay: display at di0 {\n"
+ "> +\tdisplay: display@di0 {\n"
  "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n"
  "> +\t\tpinctrl-names = \"default\";\n"
  "> +\t\tpinctrl-0 = <&pinctrl_disp0_2>;\n"
@@ -590,7 +603,7 @@
  "> +++ b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts\n"
  "> @@ -0,0 +1,248 @@\n"
  "> +/*\n"
- "> + * Copyright 2014-2016 Lothar Wa?mann <LW@KARO-electronics.de>\n"
+ "> + * Copyright 2014-2016 Lothar Wa\303\237mann <LW@KARO-electronics.de>\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"
@@ -667,7 +680,7 @@
  "> +\t\tdefault-brightness-level = <50>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tdisplay: display at di0 {\n"
+ "> +\tdisplay: display@di0 {\n"
  "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n"
  "> +\t\tpinctrl-names = \"default\";\n"
  "> +\t\tpinctrl-0 = <&pinctrl_disp0_2>;\n"
@@ -844,7 +857,7 @@
  "> +++ b/arch/arm/boot/dts/imx6q-tx6q-1036.dts\n"
  "> @@ -0,0 +1,252 @@\n"
  "> +/*\n"
- "> + * Copyright 2014-2016 Lothar Wa?mann <LW@KARO-electronics.de>\n"
+ "> + * Copyright 2014-2016 Lothar Wa\303\237mann <LW@KARO-electronics.de>\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"
@@ -921,7 +934,7 @@
  "> +\t\tdefault-brightness-level = <50>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tdisplay: display at di0 {\n"
+ "> +\tdisplay: display@di0 {\n"
  "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n"
  "> +\t\tpinctrl-names = \"default\";\n"
  "> +\t\tpinctrl-0 = <&pinctrl_disp0_2>;\n"
@@ -1100,7 +1113,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
 
-f5fc5914b1d428302a6f72a836dca068184448d4cba83a2a569f6325be293f44
+aa9a09626141385bc35679d7df8e0ecdd4c08aebf623fc391de7868e88e75bb2
