New upstream snapshot, to avoid fd.o bug #26734
diff --git a/ChangeLog b/ChangeLog
index ba87092..477ae66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit 293f4d51b473783d5c5ab773a1c438e0a2fe46f2
+Author: Brian Paul <brianp@vmware.com>
+Date: Wed Feb 24 14:04:26 2010 -0700
+
+ dri: remove old assertion (see bug 26734)
+
commit f0e99179bcf95f39ce7c4d2c2270e8a4357eaf19
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Wed Feb 24 12:00:28 2010 -0500
diff --git a/debian/changelog b/debian/changelog
index 6560f73..23af193 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
mesa (7.7-4) UNRELEASED; urgency=low
- * Pull from upstream mesa_7_7_branch up to commit f0e99179.
+ * Pull from upstream mesa_7_7_branch up to commit 293f4d51.
+ r6xx/r7xx: emit relocation for FRAG & TILE buffer, closes: #569663.
-- Brice Goglin <bgoglin@debian.org> Wed, 24 Feb 2010 20:52:19 +0100
