diff for duplicates of <3636683.EuFECY2EQB@diego>

diff --git a/a/1.txt b/N1/1.txt
index 5c243f4..ba70f29 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -62,7 +62,7 @@ Heiko
 > +		       phandle to the VPLL clock, name should be "vpll".
 > 
 >  Example:
->  hdmi: hdmi@ff980000 {
+>  hdmi: hdmi at ff980000 {
 > diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
 > b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 329099b..701bb73 100644
 > --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -131,8 +131,3 @@ Heiko
 >  }
 > 
 >  static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder)
-
-_______________________________________________
-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 7421ba7..d4bee46 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,21 +1,9 @@
  "ref\01468235079-29152-1-git-send-email-ykk@rock-chips.com\0"
  "ref\01468235149-29625-1-git-send-email-ykk@rock-chips.com\0"
- "From\0Heiko St\303\274bner <heiko@sntech.de>\0"
- "Subject\0Re: [PATCH v1 5/6] drm/rockchip: dw_hdmi: introduce the VPLL clock setting\0"
+ "From\0heiko@sntech.de (Heiko St\303\274bner)\0"
+ "Subject\0[PATCH v1 5/6] drm/rockchip: dw_hdmi: introduce the VPLL clock setting\0"
  "Date\0Tue, 12 Jul 2016 16:27:40 +0200\0"
- "To\0Yakir Yang <ykk@rock-chips.com>\0"
- "Cc\0devicetree@vger.kernel.org"
-  xhc@rock-chips.com
-  Daniel Vetter <daniel.vetter@ffwll.ch>
-  Kumar Gala <galak@codeaurora.org>
-  linux-kernel@vger.kernel.org
-  dri-devel@lists.freedesktop.org
-  linux-rockchip@lists.infradead.org
-  Rob Herring <robh+dt@kernel.org>
-  Andy Yan <andy.yan@rock-chips.com>
-  Russell King <rmk+kernel@arm.linux.org.uk>
-  Zheng Yang <zhengyang@rock-chips.com>
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Yakir,\n"
@@ -82,7 +70,7 @@
  "> +\t\t       phandle to the VPLL clock, name should be \"vpll\".\n"
  "> \n"
  ">  Example:\n"
- ">  hdmi: hdmi@ff980000 {\n"
+ ">  hdmi: hdmi at ff980000 {\n"
  "> diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c\n"
  "> b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 329099b..701bb73 100644\n"
  "> --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c\n"
@@ -150,11 +138,6 @@
  "> +\tclk_set_rate(hdmi->vpll_clk, adj_mode->clock * 1000);\n"
  ">  }\n"
  "> \n"
- ">  static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder)\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ >  static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder)
 
-908036b7f66482ae7d9f2e3d0fac93094b41aeee3905b8c3a75a5a020fdd7ab3
+6eff76ea797a271d3bf4723b6c4db4d940ce6e9dceeb575d8f9b8034ebce55b9
