diff for duplicates of <20151208150356.GA14750@rob-hp-laptop>

diff --git a/a/1.txt b/N1/1.txt
index 5d0e84a..fdb134f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -74,7 +74,7 @@ Acked-by: Rob Herring <robh@kernel.org>
 > +-------------------------------------------------------------------------------
 > +
 > +Example:
-> +	dp-controller: dp@ff970000 {
+> +	dp-controller: dp at ff970000 {
 > +		compatible = "rockchip,rk3288-dp";
 > +		reg = <0xff970000 0x4000>;
 > +		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -95,21 +95,21 @@ Acked-by: Rob Herring <robh@kernel.org>
 > +		ports {
 > +			#address-cells = <1>;
 > +			#size-cells = <0>;
-> +			edp_in: port@0 {
+> +			edp_in: port at 0 {
 > +				reg = <0>;
 > +				#address-cells = <1>;
 > +				#size-cells = <0>;
-> +				edp_in_vopb: endpoint@0 {
+> +				edp_in_vopb: endpoint at 0 {
 > +					reg = <0>;
 > +					remote-endpoint = <&vopb_out_edp>;
 > +				};
-> +				edp_in_vopl: endpoint@1 {
+> +				edp_in_vopl: endpoint at 1 {
 > +					reg = <1>;
 > +					remote-endpoint = <&vopl_out_edp>;
 > +				};
 > +			};
 > +
-> +			edp_out: port@1 {
+> +			edp_out: port at 1 {
 > +				reg = <1>;
 > +				#address-cells = <1>;
 > +				#size-cells = <0>;
@@ -131,8 +131,4 @@ Acked-by: Rob Herring <robh@kernel.org>
 > -- 
 > 1.9.1
 > 
-> 
-_______________________________________________
-dri-devel mailing list
-dri-devel@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/dri-devel
+>
diff --git a/a/content_digest b/N1/content_digest
index efe4f50..20a7b53 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,28 +1,9 @@
  "ref\01449470239-30667-1-git-send-email-ykk@rock-chips.com\0"
  "ref\01449470374-31191-1-git-send-email-ykk@rock-chips.com\0"
- "From\0Rob Herring <robh@kernel.org>\0"
- "Subject\0Re: [PATCH v10 08/17] dt-bindings: add document for rockchip variant of analogix_dp\0"
+ "From\0robh@kernel.org (Rob Herring)\0"
+ "Subject\0[PATCH v10 08/17] dt-bindings: add document for rockchip variant of analogix_dp\0"
  "Date\0Tue, 8 Dec 2015 09:03:56 -0600\0"
- "To\0Yakir Yang <ykk@rock-chips.com>\0"
- "Cc\0Krzysztof Kozlowski <k.kozlowski@samsung.com>"
-  Seung-Woo Kim <sw0312.kim@samsung.com>
-  dri-devel@lists.freedesktop.org
-  Andrzej Hajda <a.hajda@samsung.com>
-  Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-  linux-samsung-soc@vger.kernel.org
-  Russell King <linux@arm.linux.org.uk>
-  linux-rockchip@lists.infradead.org
-  Kishon Vijay Abraham I <kishon@ti.com>
-  javier@osg.samsung.com
-  Thierry Reding <treding@nvidia.com>
-  devicetree@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
-  Jingoo Han <jingoohan1@gmail.com>
-  emil.l.velikov@gmail.com
-  linux-kernel@vger.kernel.org
-  Kyungmin Park <kyungmin.park@samsung.com>
-  ajaynumb@gmail.com
- " Andy Yan <andy.yan@rock-chips.com>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, Dec 07, 2015 at 02:39:34PM +0800, Yakir Yang wrote:\n"
@@ -101,7 +82,7 @@
  "> +-------------------------------------------------------------------------------\n"
  "> +\n"
  "> +Example:\n"
- "> +\tdp-controller: dp@ff970000 {\n"
+ "> +\tdp-controller: dp at ff970000 {\n"
  "> +\t\tcompatible = \"rockchip,rk3288-dp\";\n"
  "> +\t\treg = <0xff970000 0x4000>;\n"
  "> +\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -122,21 +103,21 @@
  "> +\t\tports {\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <0>;\n"
- "> +\t\t\tedp_in: port@0 {\n"
+ "> +\t\t\tedp_in: port at 0 {\n"
  "> +\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <0>;\n"
- "> +\t\t\t\tedp_in_vopb: endpoint@0 {\n"
+ "> +\t\t\t\tedp_in_vopb: endpoint at 0 {\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t\tremote-endpoint = <&vopb_out_edp>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tedp_in_vopl: endpoint@1 {\n"
+ "> +\t\t\t\tedp_in_vopl: endpoint at 1 {\n"
  "> +\t\t\t\t\treg = <1>;\n"
  "> +\t\t\t\t\tremote-endpoint = <&vopl_out_edp>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tedp_out: port@1 {\n"
+ "> +\t\t\tedp_out: port at 1 {\n"
  "> +\t\t\t\treg = <1>;\n"
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <0>;\n"
@@ -158,10 +139,6 @@
  "> -- \n"
  "> 1.9.1\n"
  "> \n"
- "> \n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ >
 
-6fe2b449ca811ee5e2f74378207d19fb2e0c29c7eecca0555b16015f72484d23
+6783d443c16605f15c38509a088f89e82d1e9145656856db360073f1b6b89bd6
