diff for duplicates of <4184159.j0iXe39dFB@phil>

diff --git a/a/1.txt b/N1/1.txt
index a129cb3..19018e6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -29,7 +29,7 @@ index a905c14..bb74640 100644
 +- vph-supply: 1.8V power supply
 +
  Example:
- 	hdmi: hdmi at 0120000 {
+ 	hdmi: hdmi@0120000 {
  		compatible = "fsl,imx6q-hdmi";
 diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
 index d236faa..647a240 100644
@@ -104,3 +104,9 @@ index d236faa..647a240 100644
  	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
 -- 
 2.1.4
+
+
+_______________________________________________
+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 f2c3a26..3e9bfd2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,22 @@
- "From\0heiko@sntech.de (Heiko Stuebner)\0"
+ "From\0Heiko Stuebner <heiko@sntech.de>\0"
  "Subject\0[PATCH v3 1/2] drm/bridge: dw-hdmi: support optional supply regulators\0"
  "Date\0Thu, 12 Mar 2015 21:45:19 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Philipp Zabel <p.zabel@pengutronix.de>"
+  David Airlie <airlied@linux.ie>
+ " Mark Yao <mark.yao@rock-chips.com>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org
+  Russell King - ARM Linux <linux@arm.linux.org.uk>
+  Pawel Moll <pawel.moll@arm.com>
+  Ian Campbell <ijc+devicetree@hellion.org.uk>
+  Kumar Gala <galak@codeaurora.org>
+  dianders@chromium.org
+  dri-devel@lists.freedesktop.org
+  linux-rockchip@lists.infradead.org
+  Rob Herring <robh+dt@kernel.org>
+  Yakir Yang <ykk@rock-chips.com>
+  Andy Yan <andy.yan@rock-chips.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "At least the Rockchip variant of the dw_hdmi can have controllable power supplies\n"
@@ -35,7 +50,7 @@
  "+- vph-supply: 1.8V power supply\n"
  "+\n"
  " Example:\n"
- " \thdmi: hdmi at 0120000 {\n"
+ " \thdmi: hdmi@0120000 {\n"
  " \t\tcompatible = \"fsl,imx6q-hdmi\";\n"
  "diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c\n"
  "index d236faa..647a240 100644\n"
@@ -109,6 +124,12 @@
  " \n"
  " \tencoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);\n"
  "-- \n"
- 2.1.4
+ "2.1.4\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-40f03d83b1da82c54ea95871bd9c319d03205fe749f3ec1ecc7def0662a43849
+8d9e832aaa0bd250a01471003723805316f47628ff17fb0e31a5d3710fce05de
