Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c

1 files changed, 2 insertions, 1 deletions

diff --git a/cfb/cfb.h b/cfb/cfb.h
index b74a82f08..e80a427ec 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -738,7 +738,8 @@ extern PixmapPtr cfbCreatePixmap(
     ScreenPtr /*pScreen*/,
     int /*width*/,
     int /*height*/,
-    int /*depth*/
+    int /*depth*/,
+    unsigned /*usage_hint*/
 );
 
 extern Bool cfbDestroyPixmap(