xserver: Branch 'master'

[Dave Airlie]

 exa/exa.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5bf3f0fd4e00f96cfebd14b58580c3c8733626fb
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Sep 25 15:40:19 2008 +1000

    exa: make sure pixmap devPrivate.ptr is NULL at create time

diff --git a/exa/exa.c b/exa/exa.c
index 6e769a7..d240126 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -325,6 +325,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
         pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
         pExaPixmap->fb_ptr = NULL;
         pExaPixmap->pDamage = NULL;
+        pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
+        pPixmap->devPrivate.ptr = NULL;
+
     } else {
         pExaPixmap->driverPriv = NULL;
         /* Scratch pixmaps may have w/h equal to zero, and may not be