diff for duplicates of <20180504101810.065b01f6@karo-electronics.de>

diff --git a/a/1.txt b/N1/1.txt
index a42a8cd..4f6b6a1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,7 @@ On Fri,  4 May 2018 08:57:26 +0800 Shawn Guo wrote:
 > saved as well.
 > 
 For imx28-tx28.dts and imx53-tx53.dtsi:
-Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>
+Acked-By: Lothar Waßmann <LW@KARO-electronics.de>
 
 > Signed-off-by: Shawn Guo <shawnguo@kernel.org>
 > ---
@@ -29,7 +29,7 @@ Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>
 > -	clocks {
 > -		#address-cells = <1>;
 > -		#size-cells = <0>;
-> -		mclk: clock at 0 {
+> -		mclk: clock@0 {
 > -			compatible = "fixed-clock";
 > -			reg = <0>;
 > -			#clock-cells = <0>;
@@ -52,7 +52,7 @@ Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>
 >  		};
 > +	};
 >  
-> -		mclk: clock at 0 {
+> -		mclk: clock@0 {
 > -			compatible = "fixed-clock";
 > -			reg = <0>;
 > -			#clock-cells = <0>;
@@ -75,7 +75,7 @@ Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>
 >  
 > -	clocks {
 > -		/* Fixed crystal dedicated to mcp251x */
-> -		clk16m: clk at 1 {
+> -		clk16m: clk@1 {
 > -			compatible = "fixed-clock";
 > -			reg = <1>;
 > -			#clock-cells = <0>;
@@ -100,7 +100,7 @@ Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>
 >  
 >  / {
 > -	clocks {
-> -		mclk: clock at 0 {
+> -		mclk: clock@0 {
 > -			compatible = "fixed-clock";
 > -			reg = <0>;
 > -			#clock-cells = <0>;
@@ -115,4 +115,9 @@ Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>
 >  	gpio-poweroff {
 
 
-Lothar Wa?mann
+Lothar Waßmann
+
+_______________________________________________
+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 90a7fc7..facce4a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,15 @@
  "ref\01525395446-1953-1-git-send-email-shawnguo@kernel.org\0"
  "ref\01525395446-1953-5-git-send-email-shawnguo@kernel.org\0"
- "From\0LW@karo-electronics.de (Lothar Wa\303\237mann)\0"
- "Subject\0[PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks\0"
+ "From\0Lothar Wa\303\237mann <LW@karo-electronics.de>\0"
+ "Subject\0Re: [PATCH 4/4] ARM: dts: imx: drop 'clocks' container for board level clocks\0"
  "Date\0Fri, 4 May 2018 10:18:10 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  Rob Herring <robh+dt@kernel.org>
+  linux-imx@nxp.com
+  kernel@pengutronix.de
+  Fabio Estevam <fabio.estevam@nxp.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi,\n"
@@ -16,7 +22,7 @@
  "> saved as well.\n"
  "> \n"
  "For imx28-tx28.dts and imx53-tx53.dtsi:\n"
- "Acked-By: Lothar Wa?mann <LW@KARO-electronics.de>\n"
+ "Acked-By: Lothar Wa\303\237mann <LW@KARO-electronics.de>\n"
  "\n"
  "> Signed-off-by: Shawn Guo <shawnguo@kernel.org>\n"
  "> ---\n"
@@ -37,7 +43,7 @@
  "> -\tclocks {\n"
  "> -\t\t#address-cells = <1>;\n"
  "> -\t\t#size-cells = <0>;\n"
- "> -\t\tmclk: clock at 0 {\n"
+ "> -\t\tmclk: clock@0 {\n"
  "> -\t\t\tcompatible = \"fixed-clock\";\n"
  "> -\t\t\treg = <0>;\n"
  "> -\t\t\t#clock-cells = <0>;\n"
@@ -60,7 +66,7 @@
  ">  \t\t};\n"
  "> +\t};\n"
  ">  \n"
- "> -\t\tmclk: clock at 0 {\n"
+ "> -\t\tmclk: clock@0 {\n"
  "> -\t\t\tcompatible = \"fixed-clock\";\n"
  "> -\t\t\treg = <0>;\n"
  "> -\t\t\t#clock-cells = <0>;\n"
@@ -83,7 +89,7 @@
  ">  \n"
  "> -\tclocks {\n"
  "> -\t\t/* Fixed crystal dedicated to mcp251x */\n"
- "> -\t\tclk16m: clk at 1 {\n"
+ "> -\t\tclk16m: clk@1 {\n"
  "> -\t\t\tcompatible = \"fixed-clock\";\n"
  "> -\t\t\treg = <1>;\n"
  "> -\t\t\t#clock-cells = <0>;\n"
@@ -108,7 +114,7 @@
  ">  \n"
  ">  / {\n"
  "> -\tclocks {\n"
- "> -\t\tmclk: clock at 0 {\n"
+ "> -\t\tmclk: clock@0 {\n"
  "> -\t\t\tcompatible = \"fixed-clock\";\n"
  "> -\t\t\treg = <0>;\n"
  "> -\t\t\t#clock-cells = <0>;\n"
@@ -123,6 +129,11 @@
  ">  \tgpio-poweroff {\n"
  "\n"
  "\n"
- Lothar Wa?mann
+ "Lothar Wa\303\237mann\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
 
-172e427055e6927affc8449ebbc6d05d81ca446336d5066d38b8376a892f92e2
+804d6386d192afc15cf9714746ce0436a65e4eac7b773f852c0b3de166a25e46
