diff for duplicates of <20130519080152.0b486b75@armhf>

diff --git a/a/1.txt b/N1/1.txt
index 9372135..01d4db0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -42,7 +42,7 @@ Here is my dove-cubox.dts. What is wrong with it?
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		usb_power: regulator at 1 {
+		usb_power: regulator@1 {
 			compatible = "regulator-fixed";
 			reg = <1>;
 			regulator-name = "USB Power";
@@ -140,7 +140,7 @@ Here is my dove-cubox.dts. What is wrong with it?
 	status = "okay";
 
 	/* spi0.0: 4M Flash Winbond W25Q32BV */
-	spi-flash at 0 {
+	spi-flash@0 {
 		compatible = "st,w25q32";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
@@ -213,5 +213,10 @@ Here is my dove-cubox.dts. What is wrong with it?
  * ---- */
 
 -- 
-Ken ar c'henta?	|	      ** Breizh ha Linux atav! **
+Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
 Jef		|		http://moinejf.free.fr/
+
+_______________________________________________
+linux-arm-kernel mailing list
+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 1e82d9e..a6cca89 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,10 +5,15 @@
  "ref\0CAF6AEGtx7RbvKEEc5uSFvz-2uveB1cnJNf_ESn6JYhfte5UmZQ@mail.gmail.com\0"
  "ref\020130518205845.2dfe9fe5@armhf\0"
  "ref\05197D6C1.3060702@gmail.com\0"
- "From\0moinejf@free.fr (Jean-Francois Moine)\0"
- "Subject\0[RFC 4/4] DRM: tda998x: add missing include\0"
+ "From\0Jean-Francois Moine <moinejf@free.fr>\0"
+ "Subject\0Re: [RFC 4/4] DRM: tda998x: add missing include\0"
  "Date\0Sun, 19 May 2013 08:01:52 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
+ "Cc\0Rob Clark <robdclark@gmail.com>"
+  Russell King <linux@arm.linux.org.uk>
+  linux-arm-kernel@lists.infradead.org
+  dri-devel@lists.freedesktop.org
+ " Jason Cooper <jason@lakedaemon.net>\0"
  "\00:1\0"
  "b\0"
  "On Sat, 18 May 2013 21:30:09 +0200\n"
@@ -55,7 +60,7 @@
  "\t\t#address-cells = <1>;\n"
  "\t\t#size-cells = <0>;\n"
  "\n"
- "\t\tusb_power: regulator at 1 {\n"
+ "\t\tusb_power: regulator@1 {\n"
  "\t\t\tcompatible = \"regulator-fixed\";\n"
  "\t\t\treg = <1>;\n"
  "\t\t\tregulator-name = \"USB Power\";\n"
@@ -153,7 +158,7 @@
  "\tstatus = \"okay\";\n"
  "\n"
  "\t/* spi0.0: 4M Flash Winbond W25Q32BV */\n"
- "\tspi-flash at 0 {\n"
+ "\tspi-flash@0 {\n"
  "\t\tcompatible = \"st,w25q32\";\n"
  "\t\tspi-max-frequency = <20000000>;\n"
  "\t\treg = <0>;\n"
@@ -226,7 +231,12 @@
  " * ---- */\n"
  "\n"
  "-- \n"
- "Ken ar c'henta?\t|\t      ** Breizh ha Linux atav! **\n"
- "Jef\t\t|\t\thttp://moinejf.free.fr/"
+ "Ken ar c'henta\303\261\t|\t      ** Breizh ha Linux atav! **\n"
+ "Jef\t\t|\t\thttp://moinejf.free.fr/\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-884a4fc6d2eca62b96cd8aad8c574670bfebdbc03cda5d3bc817b1a15a18df13
+f8798515f23491547c21430708218cb74f8ea1b9e321bd6e78858ca39077498b
