diff -u xserver-xorg-video-savage-2.3.1/debian/changelog xserver-xorg-video-savage-2.3.1/debian/changelog
--- xserver-xorg-video-savage-2.3.1/debian/changelog
+++ xserver-xorg-video-savage-2.3.1/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.3.1-2ubuntu2.1) maverick-proposed; urgency=low
+
+  * 101_fix_use_of_privates.diff: From upstream, fixes crashes due to
+    use of uninitialized privates. LP: #635362
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Thu, 16 Dec 2010 00:14:17 +0100
+
 xserver-xorg-video-savage (1:2.3.1-2ubuntu2) maverick; urgency=low
 
   * No-change rebuild against Xserver 1.9 ABI
diff -u xserver-xorg-video-savage-2.3.1/debian/patches/series xserver-xorg-video-savage-2.3.1/debian/patches/series
--- xserver-xorg-video-savage-2.3.1/debian/patches/series
+++ xserver-xorg-video-savage-2.3.1/debian/patches/series
@@ -2,0 +3 @@
+101_fix_use_of_privates.diff
only in patch2:
unchanged:
--- xserver-xorg-video-savage-2.3.1.orig/debian/patches/101_fix_use_of_privates.diff
+++ xserver-xorg-video-savage-2.3.1/debian/patches/101_fix_use_of_privates.diff
@@ -0,0 +1,23 @@
+From 830e58d086828fa0431303df32a847ddd3022654 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Thu, 25 Nov 2010 01:58:06 +0000
+Subject: savage: fix use of privates without initialisation
+
+Fixes bug 31614.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 7c3ce90..1cb91f6 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -4267,6 +4267,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b)
+ 	ol = 0;
+     }
+     if (!(pScreen = pScrn->pScreen) 
++	|| !psav->FBStart2nd
+ 	|| !(pScrOvlPriv = fbOverlayGetScrPriv(pScreen))) 
+ 	return;
+     key = ((Shift(r,psav->overlay.redShift) & psav->overlay.redMask)
+--
+cgit v0.8.3-6-g21f6