diff for duplicates of <54575743.3080407@atmel.com>

diff --git a/a/1.txt b/N1/1.txt
index 229cbb9..32c548e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,11 +3,11 @@ On 06/10/2014 16:09, Alexandre Belloni :
 >> Add the missing CAN devices node including their pin muxing. The required
 >> clock node already exists.
 >>
->> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
-> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+>> Signed-off-by: Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>
+> Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
 
 
-Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
+Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
 and stacked on top of at91-3.19-dt branch.
 
 Thanks!
@@ -33,7 +33,7 @@ Thanks!
 >> +					};
 >> +				};
 >> +
->>  				pioA: gpio at fffff200 {
+>>  				pioA: gpio@fffff200 {
 >>  					compatible = "atmel,at91rm9200-gpio";
 >>  					reg = <0xfffff200 0x200>;
 >> @@ -898,6 +906,17 @@
@@ -41,7 +41,7 @@ Thanks!
 >>  				status = "disabled";
 >>  			};
 >> +
->> +			can: can at fffac000 {
+>> +			can: can@fffac000 {
 >> +				compatible = "atmel,at91sam9263-can";
 >> +				reg = <0xfffac000 0x300>;
 >> +				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;
@@ -53,17 +53,21 @@ Thanks!
 >> +			};
 >>  		};
 >>  
->>  		fb0: fb at 0x00700000 {
+>>  		fb0: fb@0x00700000 {
 >> -- 
 >> 2.0.4
 >>
 >>
 >> _______________________________________________
 >> 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
 > 
 
 
 -- 
 Nicolas Ferre
+--
+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 8cf5137..a7a5a97 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,19 @@
  "ref\01412599207-15676-1-git-send-email-alexander.stein@systec-electronic.com\0"
  "ref\020141006140914.GA15599@piout.net\0"
- "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0"
- "Subject\0[PATCH 1/1] ARM: at91/dt: sam9263: Add CAN device nodes\0"
+ "ref\020141006140914.GA15599-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org\0"
+ "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 1/1] ARM: at91/dt: sam9263: Add CAN device nodes\0"
  "Date\0Mon, 3 Nov 2014 11:21:55 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>"
+ " Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>\0"
+ "Cc\0Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>"
+  Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
+  Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
+  Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org>
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On 06/10/2014 16:09, Alexandre Belloni :\n"
@@ -11,11 +21,11 @@
  ">> Add the missing CAN devices node including their pin muxing. The required\n"
  ">> clock node already exists.\n"
  ">>\n"
- ">> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>\n"
- "> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n"
+ ">> Signed-off-by: Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>\n"
+ "> Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n"
  "\n"
  "\n"
- "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n"
+ "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n"
  "and stacked on top of at91-3.19-dt branch.\n"
  "\n"
  "Thanks!\n"
@@ -41,7 +51,7 @@
  ">> +\t\t\t\t\t};\n"
  ">> +\t\t\t\t};\n"
  ">> +\n"
- ">>  \t\t\t\tpioA: gpio at fffff200 {\n"
+ ">>  \t\t\t\tpioA: gpio@fffff200 {\n"
  ">>  \t\t\t\t\tcompatible = \"atmel,at91rm9200-gpio\";\n"
  ">>  \t\t\t\t\treg = <0xfffff200 0x200>;\n"
  ">> @@ -898,6 +906,17 @@\n"
@@ -49,7 +59,7 @@
  ">>  \t\t\t\tstatus = \"disabled\";\n"
  ">>  \t\t\t};\n"
  ">> +\n"
- ">> +\t\t\tcan: can at fffac000 {\n"
+ ">> +\t\t\tcan: can@fffac000 {\n"
  ">> +\t\t\t\tcompatible = \"atmel,at91sam9263-can\";\n"
  ">> +\t\t\t\treg = <0xfffac000 0x300>;\n"
  ">> +\t\t\t\tinterrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;\n"
@@ -61,19 +71,23 @@
  ">> +\t\t\t};\n"
  ">>  \t\t};\n"
  ">>  \n"
- ">>  \t\tfb0: fb at 0x00700000 {\n"
+ ">>  \t\tfb0: fb@0x00700000 {\n"
  ">> -- \n"
  ">> 2.0.4\n"
  ">>\n"
  ">>\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"
  "\n"
  "-- \n"
- Nicolas Ferre
+ "Nicolas Ferre\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
 
-7225c46dbf380f7ef9b15db6cdfcc3605fa73c6c929d777a48edc9778bcf2601
+0e04518b1dde3ed7f374b4f069a7db088eebdda8fd37aa6ee49b07f10301f0fb
