diff for duplicates of <20161230130105.GS6177@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 5cbf9fa..d607d92 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,13 +23,13 @@ Shawn
 >  				reg = <0x021b0000 0x4000>;
 >  			};
 >  
-> +			ocotp: ocotp at 021bc000 {
+> +			ocotp: ocotp@021bc000 {
 > +				compatible = "fsl,imx6ul-ocotp";
 > +				reg = <0x021bc000 0x4000>;
 > +				clocks = <&clks IMX6UL_CLK_OCOTP>;
 > +			};
 > +
->  			lcdif: lcdif at 021c8000 {
+>  			lcdif: lcdif@021c8000 {
 >  				compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
 >  				reg = <0x021c8000 0x4000>;
 > -- 
@@ -38,5 +38,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 3b2186e..aa3a596 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,18 @@
  "ref\01480689949-17957-1-git-send-email-d.schultz@phytec.de\0"
  "ref\01480689949-17957-2-git-send-email-d.schultz@phytec.de\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH 2/3] ARM: dts: imx6ul: Add OCOTP node\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH 2/3] ARM: dts: imx6ul: Add OCOTP node\0"
  "Date\0Fri, 30 Dec 2016 21:01:06 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Daniel Schultz <d.schultz@phytec.de>\0"
+ "Cc\0mark.rutland@arm.com"
+  devicetree@vger.kernel.org
+  Bai Ping <ping.bai@nxp.com>
+  robh+dt@kernel.org
+  srinivas.kandagatla@linaro.org
+  kernel@pengutronix.de
+  fabio.estevam@nxp.com
+  maxime.ripard@free-electrons.com
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Dec 02, 2016 at 03:45:48PM +0100, Daniel Schultz wrote:\n"
@@ -31,13 +40,13 @@
  ">  \t\t\t\treg = <0x021b0000 0x4000>;\n"
  ">  \t\t\t};\n"
  ">  \n"
- "> +\t\t\tocotp: ocotp at 021bc000 {\n"
+ "> +\t\t\tocotp: ocotp@021bc000 {\n"
  "> +\t\t\t\tcompatible = \"fsl,imx6ul-ocotp\";\n"
  "> +\t\t\t\treg = <0x021bc000 0x4000>;\n"
  "> +\t\t\t\tclocks = <&clks IMX6UL_CLK_OCOTP>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- ">  \t\t\tlcdif: lcdif at 021c8000 {\n"
+ ">  \t\t\tlcdif: lcdif@021c8000 {\n"
  ">  \t\t\t\tcompatible = \"fsl,imx6ul-lcdif\", \"fsl,imx28-lcdif\";\n"
  ">  \t\t\t\treg = <0x021c8000 0x4000>;\n"
  "> -- \n"
@@ -46,7 +55,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
 
-f0dd755fe7d48e9ee2a56d04633172cbfe314360cdf7756a9b415350255c0f1a
+7ec3bdc2aa7bf7f6bdcc3a3fc92469c1ce3d3845ab2edf78cd51b6f1b502e0dc
