diff for duplicates of <20161010214821.GA17551@rob-hp-laptop>

diff --git a/a/1.txt b/N1/1.txt
index a6cc7b0..6a4951d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ On Sun, Oct 09, 2016 at 03:49:10PM +0800, Shawn Guo wrote:
 > 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,7 +44,7 @@ Acked-by: Rob Herring <robh@kernel.org>
 > index d03ba4c4810c..6bb4ab2517ef 100644
 > --- a/Documentation/devicetree/bindings/display/zte,vou.txt
 > +++ b/Documentation/devicetree/bindings/display/zte,vou.txt
-> @@ -56,14 +56,13 @@ vou: vou at 1440000 {
+> @@ -56,14 +56,13 @@ vou: vou@1440000 {
 >         compatible = "zte,zx296718-vou";
 >         #address-cells = <1>;
 >         #size-cells = <1>;
@@ -52,8 +52,8 @@ Acked-by: Rob Herring <robh@kernel.org>
 > -       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>,
@@ -64,14 +64,18 @@ Acked-by: Rob Herring <robh@kernel.org>
 >                 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 7b70ba1..e262911 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,17 +2,24 @@
  "ref\01474727185-24180-2-git-send-email-shawn.guo@linaro.org\0"
  "ref\020161003174429.GA26054@rob-hp-laptop\0"
  "ref\020161009074910.GA15400@tiger\0"
- "From\0robh@kernel.org (Rob Herring)\0"
- "Subject\0[PATCH v2 1/2] dt-bindings: add bindings doc for ZTE VOU display controller\0"
+ "From\0Rob Herring <robh@kernel.org>\0"
+ "Subject\0Re: [PATCH v2 1/2] dt-bindings: add bindings doc for ZTE VOU display controller\0"
  "Date\0Mon, 10 Oct 2016 16:48:21 -0500\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Shawn Guo <shawnguo@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 Sun, Oct 09, 2016 at 03:49:10PM +0800, Shawn Guo wrote:\n"
  "> 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"
@@ -54,7 +61,7 @@
  "> index d03ba4c4810c..6bb4ab2517ef 100644\n"
  "> --- a/Documentation/devicetree/bindings/display/zte,vou.txt\n"
  "> +++ b/Documentation/devicetree/bindings/display/zte,vou.txt\n"
- "> @@ -56,14 +56,13 @@ vou: vou at 1440000 {\n"
+ "> @@ -56,14 +56,13 @@ vou: vou@1440000 {\n"
  ">         compatible = \"zte,zx296718-vou\";\n"
  ">         #address-cells = <1>;\n"
  ">         #size-cells = <1>;\n"
@@ -62,8 +69,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"
@@ -74,16 +81,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>;\n"
- >
+ "> \n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-e490d7c4f3a3b76dcf5974b531e57e3447c30c79d9650dbffd7d82bbb39d4a7d
+893833d0812873026604363cdcb6c7a79215fe7c94ae22fc2f057f13ef1e68c2
