summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-12-06 09:42:19 -0800
committerIan Romanick <ian.d.romanick@intel.com>2013-12-06 09:42:58 -0800
commit8991193f70c9879162e3822589a6c17afdae433c (patch)
treee442a00f4d5bfcc648f9fd5ead2dd37da1c95a60
parent6c00504a8aa2670623cc0b26d1b8448f5a75e467 (diff)
Remove a057b83 from the pick list
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--bin/.cherry-ignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index e4aaba7a245..21338f7534e 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -6,3 +6,8 @@ f0f202e6b764be803470e27cba9102f14361ae22 glx: conditionaly build dri3 and presen
# issue can be resolved. See
# http://lists.freedesktop.org/archives/mesa-dev/2013-November/048899.html
068a073c1d4853b5c8f33efdeb481026f42e23a5 meta: fix meta clear of layered framebuffers
+
+# This patch isn't actually necessary because that bug that it fixes isn't in
+# the 10.0 branch. See
+# http://lists.freedesktop.org/archives/mesa-stable/2013-December/000500.html
+a057b837ddd1c725a7504eedc53c6df05a012773 egl: add HAVE_LIBDRM define, fix EGL X11 platform