diff for duplicates of <11434893.zL5bTOLgHP@phil>

diff --git a/a/1.txt b/N1/1.txt
index f001d0f..653bc3c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -337,8 +337,3 @@ Heiko
 >  /* rk3288 register definition */
 >  #define RK3288_REG_CFG_DONE			0x0000
 >  #define RK3288_VERSION_INFO			0x0004
-
-_______________________________________________
-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 17ee28e..973a834 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,15 +4,17 @@
  "Subject\0Re: [RFC PATCH v1 1/2] drm/rockchip: vop: add rk3229 vop support\0"
  "Date\0Mon, 04 Jan 2016 13:23:41 +0100\0"
  "To\0Yakir Yang <ykk@rock-chips.com>\0"
- "Cc\0Mark Rutland <mark.rutland@arm.com>"
-  devicetree@vger.kernel.org
+ "Cc\0Mark Yao <mark.yao@rock-chips.com>"
+  David Airlie <airlied@linux.ie>
+  Rob Herring <robh+dt@kernel.org>
   Pawel Moll <pawel.moll@arm.com>
+  Mark Rutland <mark.rutland@arm.com>
   Ian Campbell <ijc+devicetree@hellion.org.uk>
-  linux-kernel@vger.kernel.org
+  Kumar Gala <galak@codeaurora.org>
+  devicetree@vger.kernel.org
   dri-devel@lists.freedesktop.org
-  linux-rockchip@lists.infradead.org
-  Rob Herring <robh+dt@kernel.org>
- " Kumar Gala <galak@codeaurora.org>\0"
+  linux-kernel@vger.kernel.org
+ " linux-rockchip@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Yakir,\n"
@@ -353,11 +355,6 @@
  "> +\n"
  ">  /* rk3288 register definition */\n"
  ">  #define RK3288_REG_CFG_DONE\t\t\t0x0000\n"
- ">  #define RK3288_VERSION_INFO\t\t\t0x0004\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ ">  #define RK3288_VERSION_INFO\t\t\t0x0004"
 
-91c7188ac0856262a8bd642ee376b9555fd1856ce23b21b4bd48cf879736dac3
+10a5f3acc17771267c58e051082796b0d62aa3b53ff741cea52b5ba3db5424ab
