diff for duplicates of <20141002105716.GG3907@piout.net>

diff --git a/a/1.txt b/N1/1.txt
index 9eee4bf..fee34ee 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ Hi,
 On 02/10/2014 at 12:38:14 +0200, Alexander Stein wrote :
 > Add the missing CAN devices node including their pin muxing and clocks.
 > 
-> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
+> Signed-off-by: Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>
 > ---
 > I could actually only test CAN1 due to the hardware I had available. Also
 > CAN0 conflicts with DBGU pins, which I had to use.
@@ -45,7 +45,7 @@ ditto
 > +					};
 > +				};
 > +
->  				pioA: gpio at fffff400 {
+>  				pioA: gpio@fffff400 {
 >  					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 >  					reg = <0xfffff400 0x200>;
 > -- 
@@ -54,10 +54,14 @@ ditto
 > 
 > _______________________________________________
 > 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
 
 -- 
 Alexandre Belloni, Free Electrons
 Embedded Linux, Kernel and Android engineering
 http://free-electrons.com
+--
+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 63a2726..e6aedaf 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,18 @@
  "ref\01412246294-27370-1-git-send-email-alexander.stein@systec-electronic.com\0"
- "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0"
- "Subject\0[PATCH 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes\0"
+ "ref\01412246294-27370-1-git-send-email-alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org\0"
+ "From\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes\0"
  "Date\0Thu, 2 Oct 2014 12:57:16 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alexander 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>
+  Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@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"
  "Hi,\n"
@@ -10,7 +20,7 @@
  "On 02/10/2014 at 12:38:14 +0200, Alexander Stein wrote :\n"
  "> Add the missing CAN devices node including their pin muxing and clocks.\n"
  "> \n"
- "> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>\n"
+ "> Signed-off-by: Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>\n"
  "> ---\n"
  "> I could actually only test CAN1 due to the hardware I had available. Also\n"
  "> CAN0 conflicts with DBGU pins, which I had to use.\n"
@@ -52,7 +62,7 @@
  "> +\t\t\t\t\t};\n"
  "> +\t\t\t\t};\n"
  "> +\n"
- ">  \t\t\t\tpioA: gpio at fffff400 {\n"
+ ">  \t\t\t\tpioA: gpio@fffff400 {\n"
  ">  \t\t\t\t\tcompatible = \"atmel,at91sam9x5-gpio\", \"atmel,at91rm9200-gpio\";\n"
  ">  \t\t\t\t\treg = <0xfffff400 0x200>;\n"
  "> -- \n"
@@ -61,12 +71,16 @@
  "> \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"
  "Alexandre Belloni, Free Electrons\n"
  "Embedded Linux, Kernel and Android engineering\n"
- http://free-electrons.com
+ "http://free-electrons.com\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
 
-3a5734ed0a3d370c861290c06c13c5521d13139fe544c5157825a1c4ee172c20
+6b29312fd4da62ce35a4db7a2348cd3831c673fb6c451c032f2a68e36d9c7752
