diff for duplicates of <20181104144614.GJ26016@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 355ea8c..12875eb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,7 +21,7 @@ Shawn
 > --- a/arch/arm/boot/dts/imx25.dtsi
 > +++ b/arch/arm/boot/dts/imx25.dtsi
 > @@ -388,12 +388,16 @@
->  			epit1: timer at 53f94000 {
+>  			epit1: timer@53f94000 {
 >  				compatible = "fsl,imx25-epit";
 >  				reg = <0x53f94000 0x4000>;
 > +				clocks = <&clks 83>, <&clks 43>;
@@ -29,7 +29,7 @@ Shawn
 >  				interrupts = <28>;
 >  			};
 >  
->  			epit2: timer at 53f98000 {
+>  			epit2: timer@53f98000 {
 >  				compatible = "fsl,imx25-epit";
 >  				reg = <0x53f98000 0x4000>;
 > +				clocks = <&clks 84>, <&clks 43>;
@@ -43,5 +43,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 67f472e..5622510 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,16 @@
  "ref\01541093567-29205-1-git-send-email-martin@kaiser.cx\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH] ARM: dts: i.MX25: add the clocks for the EPIT blocks\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH] ARM: dts: i.MX25: add the clocks for the EPIT blocks\0"
  "Date\0Sun, 4 Nov 2018 22:46:16 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Martin Kaiser <martin@kaiser.cx>\0"
+ "Cc\0Sascha Hauer <s.hauer@pengutronix.de>"
+  Pengutronix Kernel Team <kernel@pengutronix.de>
+  Fabio Estevam <fabio.estevam@nxp.com>
+  NXP Linux Team <linux-imx@nxp.com>
+  Rob Herring <robh+dt@kernel.org>
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Nov 01, 2018 at 06:32:47PM +0100, Martin Kaiser wrote:\n"
@@ -28,7 +36,7 @@
  "> --- a/arch/arm/boot/dts/imx25.dtsi\n"
  "> +++ b/arch/arm/boot/dts/imx25.dtsi\n"
  "> @@ -388,12 +388,16 @@\n"
- ">  \t\t\tepit1: timer at 53f94000 {\n"
+ ">  \t\t\tepit1: timer@53f94000 {\n"
  ">  \t\t\t\tcompatible = \"fsl,imx25-epit\";\n"
  ">  \t\t\t\treg = <0x53f94000 0x4000>;\n"
  "> +\t\t\t\tclocks = <&clks 83>, <&clks 43>;\n"
@@ -36,7 +44,7 @@
  ">  \t\t\t\tinterrupts = <28>;\n"
  ">  \t\t\t};\n"
  ">  \n"
- ">  \t\t\tepit2: timer at 53f98000 {\n"
+ ">  \t\t\tepit2: timer@53f98000 {\n"
  ">  \t\t\t\tcompatible = \"fsl,imx25-epit\";\n"
  ">  \t\t\t\treg = <0x53f98000 0x4000>;\n"
  "> +\t\t\t\tclocks = <&clks 84>, <&clks 43>;\n"
@@ -50,7 +58,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
 
-49ced895f1d120e8f17202179343e0ad49f64f08b2fb15546accecfdbb1c3e86
+185b08637a79476c166b5628d1fab9559483f8c22e2938588c49f03b5385a372
