diff for duplicates of <20161009074910.GA15400@tiger>

diff --git a/a/1.txt b/N1/1.txt
index abd81f9..f11fb85 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 On Mon, Oct 03, 2016 at 12:44:29PM -0500, Rob Herring wrote:
 > > +Example:
 > > +
-> > +vou: vou at 1440000 {
+> > +vou: vou@1440000 {
 > > +	compatible = "zte,zx296718-vou";
 > > +	#address-cells = <1>;
 > > +	#size-cells = <1>;
@@ -44,8 +44,8 @@ index d03ba4c4810c..6bb4ab2517ef 100644
 -       ranges;
 +       ranges = <0 0x1440000 0x10000>;
  
--       dpc: dpc at 1440000 {
-+       dpc: dpc at 0 {
+-       dpc: dpc@1440000 {
++       dpc: dpc@0 {
                 compatible = "zte,zx296718-dpc";
 -               reg = <0x1440000 0x1000>, <0x1441000 0x1000>,
 -                     <0x1445000 0x1000>, <0x1446000 0x1000>,
@@ -56,13 +56,18 @@ index d03ba4c4810c..6bb4ab2517ef 100644
                 reg-names = "osd", "timing_ctrl",
                             "dtrc", "vou_ctrl",
                             "otfppu";
-@@ -74,9 +73,9 @@ vou: vou at 1440000 {
+@@ -74,9 +73,9 @@ vou: vou@1440000 {
                               "main_wclk", "aux_wclk";
         };
  
--       hdmi: hdmi at 144c000 {
-+       hdmi: hdmi at c000 {
+-       hdmi: hdmi@144c000 {
++       hdmi: hdmi@c000 {
                 compatible = "zte,zx296718-hdmi";
 -               reg = <0x144c000 0x4000>;
 +               reg = <0xc000 0x4000>;
                 interrupts = <GIC_SPI 82 IRQ_TYPE_EDGE_RISING>;
+
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 2025a2e..79060f8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,23 @@
  "ref\01474727185-24180-1-git-send-email-shawn.guo@linaro.org\0"
  "ref\01474727185-24180-2-git-send-email-shawn.guo@linaro.org\0"
  "ref\020161003174429.GA26054@rob-hp-laptop\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2 1/2] dt-bindings: add bindings doc for ZTE VOU display controller\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v2 1/2] dt-bindings: add bindings doc for ZTE VOU display controller\0"
  "Date\0Sun, 9 Oct 2016 15:49:10 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Rob Herring <robh@kernel.org>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org
+  Daniel Vetter <daniel.vetter@ffwll.ch>
+  Baoyou Xie <xie.baoyou@zte.com.cn>
+  dri-devel@lists.freedesktop.org
+  Jun Nie <jun.nie@linaro.org>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, Oct 03, 2016 at 12:44:29PM -0500, Rob Herring wrote:\n"
  "> > +Example:\n"
  "> > +\n"
- "> > +vou: vou at 1440000 {\n"
+ "> > +vou: vou@1440000 {\n"
  "> > +\tcompatible = \"zte,zx296718-vou\";\n"
  "> > +\t#address-cells = <1>;\n"
  "> > +\t#size-cells = <1>;\n"
@@ -53,8 +60,8 @@
  "-       ranges;\n"
  "+       ranges = <0 0x1440000 0x10000>;\n"
  " \n"
- "-       dpc: dpc at 1440000 {\n"
- "+       dpc: dpc at 0 {\n"
+ "-       dpc: dpc@1440000 {\n"
+ "+       dpc: dpc@0 {\n"
  "                compatible = \"zte,zx296718-dpc\";\n"
  "-               reg = <0x1440000 0x1000>, <0x1441000 0x1000>,\n"
  "-                     <0x1445000 0x1000>, <0x1446000 0x1000>,\n"
@@ -65,15 +72,20 @@
  "                reg-names = \"osd\", \"timing_ctrl\",\n"
  "                            \"dtrc\", \"vou_ctrl\",\n"
  "                            \"otfppu\";\n"
- "@@ -74,9 +73,9 @@ vou: vou at 1440000 {\n"
+ "@@ -74,9 +73,9 @@ vou: vou@1440000 {\n"
  "                              \"main_wclk\", \"aux_wclk\";\n"
  "        };\n"
  " \n"
- "-       hdmi: hdmi at 144c000 {\n"
- "+       hdmi: hdmi at c000 {\n"
+ "-       hdmi: hdmi@144c000 {\n"
+ "+       hdmi: hdmi@c000 {\n"
  "                compatible = \"zte,zx296718-hdmi\";\n"
  "-               reg = <0x144c000 0x4000>;\n"
  "+               reg = <0xc000 0x4000>;\n"
-                 interrupts = <GIC_SPI 82 IRQ_TYPE_EDGE_RISING>;
+ "                interrupts = <GIC_SPI 82 IRQ_TYPE_EDGE_RISING>;\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-ef3a27263ab3cf8bfd6500f5115c8624b6422ca301a2d65af8ed0f8132cd2417
+ffc3b99ab00f15363d5f73fe4cc8dfd41046ab468437d8d05b5fed5bcf85446a
