diff for duplicates of <55DF3886.1060001@virtuousgeek.org>

diff --git a/a/1.txt b/N1/1.txt
index 3e25404..925d5a8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -39,7 +39,3 @@ and the fb console doesn't come up.  Is this a merge error somehow?  I don't see
 
 Thanks,
 Jesse
-_______________________________________________
-Intel-gfx mailing list
-Intel-gfx@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/a/content_digest b/N1/content_digest
index 74aeaa3..e1d1718 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,7 +3,7 @@
  "ref\020150826130659.GP1367@phenom.ffwll.local\0"
  "ref\087zj1dw2ku.fsf@intel.com\0"
  "From\0Jesse Barnes <jbarnes@virtuousgeek.org>\0"
- "Subject\0Re: [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects\0"
+ "Subject\0Re: [Intel-gfx] [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects\0"
  "Date\0Thu, 27 Aug 2015 09:19:18 -0700\0"
  "To\0Jani Nikula <jani.nikula@linux.intel.com>"
   Daniel Vetter <daniel@ffwll.ch>
@@ -55,10 +55,6 @@
  "and the fb console doesn't come up.  Is this a merge error somehow?  I don't see how it could have worked... maybe w/o fbdev enabled or something?\n"
  "\n"
  "Thanks,\n"
- "Jesse\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/intel-gfx
+ Jesse
 
-dbcda9ebc4b433cb46cc5b979af3d9c2a309319706ad30f817c2265e1eb7238b
+7d4058b7106f877b4651a6d3383b58d267177c389111823ef3f266079ae442a7
