diff for duplicates of <20130713103516.38a55b0b@armhf>

diff --git a/a/1.txt b/N1/1.txt
index eacd943..c0d8987 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -87,7 +87,7 @@ The Cubox is based on the Armada 510 (Dove), so, all the hardware must
 be described in dove.dtsi. This includes the LCDs and DCON/IRE, the
 possible clocks and the (static) v4l2 links:
 
-	lcd0: lcd-controller at 820000 {
+	lcd0: lcd-controller@820000 {
 		compatible = "marvell,dove-lcd0";
 		reg = <0x820000 0x1c8>;
 		interrupts = <47>;
@@ -97,7 +97,7 @@ possible clocks and the (static) v4l2 links:
 		status = "disabled";
 	};
 
-	lcd1: lcd-controller at 810000 {
+	lcd1: lcd-controller@810000 {
 		compatible = "marvell,dove-lcd1";
 		reg = <0x810000 0x1c8>;
 		interrupts = <46>;
@@ -108,7 +108,7 @@ possible clocks and the (static) v4l2 links:
 	};
 
 	/* display controller and image rotation engine */
-	dcon: display-controller at 830000 {
+	dcon: display-controller@830000 {
 		compatible = "marvell,dove-dcon";
 		reg = <0x830000 0xc4>,			/* DCON */
 		      <0x831000 0x8c>;			/* IRE */
@@ -173,5 +173,10 @@ zeroed in the board specific DT:
 	};
 
 -- 
-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 d2ae567..08a0ebf 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,17 @@
  "ref\020130712164428.AC3D2FAAE9@dev.laptop.org\0"
  "ref\020130712203952.6b7aa927@armhf\0"
  "ref\0CAMLZHHT1oAvOLe3JgQqMqLNXEr0NGrdtgELtF_djbqLFceHtiQ@mail.gmail.com\0"
- "From\0moinejf@free.fr (Jean-Francois Moine)\0"
- "Subject\0DT binding review for Armada display subsystem\0"
+ "From\0Jean-Francois Moine <moinejf@free.fr>\0"
+ "Subject\0Re: DT binding review for Armada display subsystem\0"
  "Date\0Sat, 13 Jul 2013 10:35:16 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Daniel Drake <dsd@laptop.org>\0"
+ "Cc\0devicetree-discuss@lists.ozlabs.org <devicetree-discuss@lists.ozlabs.org>"
+  dri-devel@lists.freedesktop.org
+  Grant Likely <grant.likely@secretlab.ca>
+  Russell King <rmk@arm.linux.org.uk>
+  s.hauer@pengutronix.de
+  linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
+ " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
  "\00:1\0"
  "b\0"
  "On Fri, 12 Jul 2013 13:00:23 -0600\n"
@@ -96,7 +103,7 @@
  "be described in dove.dtsi. This includes the LCDs and DCON/IRE, the\n"
  "possible clocks and the (static) v4l2 links:\n"
  "\n"
- "\tlcd0: lcd-controller at 820000 {\n"
+ "\tlcd0: lcd-controller@820000 {\n"
  "\t\tcompatible = \"marvell,dove-lcd0\";\n"
  "\t\treg = <0x820000 0x1c8>;\n"
  "\t\tinterrupts = <47>;\n"
@@ -106,7 +113,7 @@
  "\t\tstatus = \"disabled\";\n"
  "\t};\n"
  "\n"
- "\tlcd1: lcd-controller at 810000 {\n"
+ "\tlcd1: lcd-controller@810000 {\n"
  "\t\tcompatible = \"marvell,dove-lcd1\";\n"
  "\t\treg = <0x810000 0x1c8>;\n"
  "\t\tinterrupts = <46>;\n"
@@ -117,7 +124,7 @@
  "\t};\n"
  "\n"
  "\t/* display controller and image rotation engine */\n"
- "\tdcon: display-controller at 830000 {\n"
+ "\tdcon: display-controller@830000 {\n"
  "\t\tcompatible = \"marvell,dove-dcon\";\n"
  "\t\treg = <0x830000 0xc4>,\t\t\t/* DCON */\n"
  "\t\t      <0x831000 0x8c>;\t\t\t/* IRE */\n"
@@ -182,7 +189,12 @@
  "\t};\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
 
-ffca30205bfa042f31f9a8535eb75c990c5222543aff4758c44a3022ab7b149e
+fc89f15f50d04ab5fab6a0da93f73702e26994dc26bed4e2817ca3997966a9b0
