diff for duplicates of <20151124083840.GP11999@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 0eb9efe..d668aa8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,9 +1,9 @@
-On Tue, Nov 10, 2015 at 11:06:38AM +0800, Yuantian.Tang at freescale.com wrote:
-> From: Tang Yuantian <Yuantian.Tang@freescale.com>
+On Tue, Nov 10, 2015 at 11:06:38AM +0800, Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org wrote:
+> From: Tang Yuantian <Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
 > 
 > Added SATA node to LS1021A DTS to support SATA function.
 > 
-> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
+> Signed-off-by: Tang Yuantian <Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
 > ---
 >  arch/arm/boot/dts/ls1021a.dtsi | 10 ++++++++++
 >  1 file changed, 10 insertions(+)
@@ -16,7 +16,7 @@ On Tue, Nov 10, 2015 at 11:06:38AM +0800, Yuantian.Tang at freescale.com wrote:
 >  			status = "disabled";
 >  		};
 >  
-> +		sata: sata at 3200000 {
+> +		sata: sata@3200000 {
 > +			compatible = "fsl,ls1021a-ahci";
 > +			reg = <0x0 0x3200000 0x0 0x10000>,
 > +			      <0x0 0x20220520 0x0 0x4>;
@@ -31,7 +31,7 @@ Shawn
 > +			dma-coherent;
 > +		};
 > +
->  		scfg: scfg at 1570000 {
+>  		scfg: scfg@1570000 {
 >  			compatible = "fsl,ls1021a-scfg", "syscon";
 >  			reg = <0x0 0x1570000 0x0 0x10000>;
 > -- 
@@ -40,6 +40,10 @@ Shawn
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
->
+> 
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index 34674d3..1a3ec9d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,19 @@
  "ref\01447124798-34952-1-git-send-email-Yuantian.Tang@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH] ARM: DTS: LS1021A: add SATA node to DTS\0"
+ "ref\01447124798-34952-1-git-send-email-Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH] ARM: DTS: LS1021A: add SATA node to DTS\0"
  "Date\0Tue, 24 Nov 2015 16:38:40 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0"
+ "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
- "On Tue, Nov 10, 2015 at 11:06:38AM +0800, Yuantian.Tang at freescale.com wrote:\n"
- "> From: Tang Yuantian <Yuantian.Tang@freescale.com>\n"
+ "On Tue, Nov 10, 2015 at 11:06:38AM +0800, Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org wrote:\n"
+ "> From: Tang Yuantian <Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
  "> \n"
  "> Added SATA node to LS1021A DTS to support SATA function.\n"
  "> \n"
- "> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>\n"
+ "> Signed-off-by: Tang Yuantian <Yuantian.Tang-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
  "> ---\n"
  ">  arch/arm/boot/dts/ls1021a.dtsi | 10 ++++++++++\n"
  ">  1 file changed, 10 insertions(+)\n"
@@ -23,7 +26,7 @@
  ">  \t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tsata: sata at 3200000 {\n"
+ "> +\t\tsata: sata@3200000 {\n"
  "> +\t\t\tcompatible = \"fsl,ls1021a-ahci\";\n"
  "> +\t\t\treg = <0x0 0x3200000 0x0 0x10000>,\n"
  "> +\t\t\t      <0x0 0x20220520 0x0 0x4>;\n"
@@ -38,7 +41,7 @@
  "> +\t\t\tdma-coherent;\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tscfg: scfg at 1570000 {\n"
+ ">  \t\tscfg: scfg@1570000 {\n"
  ">  \t\t\tcompatible = \"fsl,ls1021a-scfg\", \"syscon\";\n"
  ">  \t\t\treg = <0x0 0x1570000 0x0 0x10000>;\n"
  "> -- \n"
@@ -47,8 +50,12 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
- >
+ "> \n"
+ "--\n"
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
+ More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-092c716129d56db6ffa1cf9eec0fc6f423ddfaf87b45c94eb630cea1eac73c64
+438c2995339be387b42a08b542706ea43784463e9f8d86ce6ac2a572a5d9388f
