diff for duplicates of <20160609133057.GB19473@tiger>

diff --git a/a/1.txt b/N1/1.txt
index b880a8d..0fe5dc7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,7 +14,7 @@ On Tue, May 17, 2016 at 04:16:30PM -0400, Damien Riegel wrote:
 >  		#size-cells = <1>;
 >  		ranges = <0 0 0 0x1d000>;
 >  
-> +		can at 0,1a000 {
+> +		can@0,1a000 {
 > +			compatible = "technologic,sja1000";
 > +			reg = <0x1a000 0x00000100>;
 > +			interrupt-parent = <&fpga_irqc>;
@@ -30,7 +30,7 @@ more sense to sort the nodes in order of unit-address.
 
 Shawn
 
->  		fpga_irqc: fpga_irqc at 0,15000 {
+>  		fpga_irqc: fpga_irqc@0,15000 {
 >  			compatible = "technologic,ts4800-irqc";
 >  			reg = <0x15000 0x1000>;
 > -- 
@@ -39,5 +39,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 7072b52..d73c2e0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,20 @@
  "ref\01463516190-10606-1-git-send-email-damien.riegel@savoirfairelinux.com\0"
  "ref\01463516190-10606-2-git-send-email-damien.riegel@savoirfairelinux.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH 2/2] ARM: dts: TS-4800: add CAN support\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH 2/2] ARM: dts: TS-4800: add CAN support\0"
  "Date\0Thu, 9 Jun 2016 21:30:57 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Damien Riegel <damien.riegel@savoirfairelinux.com>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-kernel@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+  Mark Rutland <mark.rutland@arm.com>
+  Pawel Moll <pawel.moll@arm.com>
+  Ian Campbell <ijc+devicetree@hellion.org.uk>
+  Russell King <linux@armlinux.org.uk>
+  Rob Herring <robh+dt@kernel.org>
+  kernel@savoirfairelinux.com
+  Sascha Hauer <kernel@pengutronix.de>
+ " Kumar Gala <galak@codeaurora.org>\0"
  "\00:1\0"
  "b\0"
  "On Tue, May 17, 2016 at 04:16:30PM -0400, Damien Riegel wrote:\n"
@@ -22,7 +33,7 @@
  ">  \t\t#size-cells = <1>;\n"
  ">  \t\tranges = <0 0 0 0x1d000>;\n"
  ">  \n"
- "> +\t\tcan at 0,1a000 {\n"
+ "> +\t\tcan@0,1a000 {\n"
  "> +\t\t\tcompatible = \"technologic,sja1000\";\n"
  "> +\t\t\treg = <0x1a000 0x00000100>;\n"
  "> +\t\t\tinterrupt-parent = <&fpga_irqc>;\n"
@@ -38,7 +49,7 @@
  "\n"
  "Shawn\n"
  "\n"
- ">  \t\tfpga_irqc: fpga_irqc at 0,15000 {\n"
+ ">  \t\tfpga_irqc: fpga_irqc@0,15000 {\n"
  ">  \t\t\tcompatible = \"technologic,ts4800-irqc\";\n"
  ">  \t\t\treg = <0x15000 0x1000>;\n"
  "> -- \n"
@@ -47,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
 
-093ddc8bd4f5e18ba0fd5eada246f75712871a192cb0694fc1b071a90fb97682
+09e7cf50906f3345a125afe14053d738e2ecfef4bd946bb13fc7070032e770e0
