Merge branch 'master' into XACE-SELINUX

Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h

1 files changed, 1 insertions, 0 deletions

diff --git a/exa/exa.c b/exa/exa.c
index a5b1d37a3..cbe66e875 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -256,6 +256,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
         return NULL;
 
     pExaPixmap = ExaGetPixmapPriv(pPixmap);
+    pExaPixmap->driverPriv = NULL;
 
     bpp = pPixmap->drawable.bitsPerPixel;