diff for duplicates of <20141219111413.GA17269@athens>

diff --git a/a/1.txt b/N1/1.txt
index b357e64..fb265db 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,7 +26,3 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
  }
  
  void cirrus_fbdev_fini(struct cirrus_device *cdev)
-_______________________________________________
-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 6133070..d4216c9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,15 +3,16 @@
  "Subject\0[PATCH] drm/fb-helper: fix simple_return.cocci warnings\0"
  "Date\0Fri, 19 Dec 2014 19:14:13 +0800\0"
  "To\0Thierry Reding <treding@nvidia.com>\0"
- "Cc\0Daniel Vetter <daniel.vetter@ffwll.ch>"
-  linux-kernel@vger.kernel.org
-  dri-devel@lists.freedesktop.org
-  Fabian Frederick <fabf@skynet.be>
+ "Cc\0kbuild-all@01.org"
+  Daniel Vetter <daniel.vetter@ffwll.ch>
+  David Airlie <airlied@linux.ie>
+  Dave Airlie <airlied@redhat.com>
+  Russell King <rmk+kernel@arm.linux.org.uk>
   Zach Reizner <zachr@google.com>
-  kbuild-all@01.org
+  Fabian Frederick <fabf@skynet.be>
   Martin Koegler <martin.koegler@chello.at>
-  Dave Airlie <airlied@redhat.com>
- " Russell King <rmk+kernel@arm.linux.org.uk>\0"
+  dri-devel@lists.freedesktop.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "drivers/gpu/drm/cirrus/cirrus_fbdev.c:330:1-4: WARNING: end returns can be simpified\n"
@@ -41,10 +42,6 @@
  "+\treturn drm_fb_helper_initial_config(&gfbdev->helper, bpp_sel);\n"
  " }\n"
  " \n"
- " void cirrus_fbdev_fini(struct cirrus_device *cdev)\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+  void cirrus_fbdev_fini(struct cirrus_device *cdev)
 
-3ab737bc82fb3ea5ab669e6ac12144d186d4e312fddb7bf2c1d53c893243fa8c
+c736e93d05cec9237c748ad5a07b3f20e5c6467be7f42333d9dbcb366bb02901
