Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/securitysrv.h
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_size_get.c
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winglobals.h
	xorg-server/hw/xwin/winmonitors.h
	xorg-server/include/closestr.h
	xorg-server/include/pixmapstr.h
	xorg-server/include/servermd.h
	xorg-server/include/site.h
	xorg-server/include/windowstr.h
	xorg-server/include/xkbstr.h

1 files changed, 6 insertions, 7 deletions

diff --git a/xorg-server/hw/kdrive/fake/os.c b/xorg-server/hw/kdrive/fake/os.c
index 76cd9e728..01bb37bd5 100644
--- a/xorg-server/hw/kdrive/fake/os.c
+++ b/xorg-server/hw/kdrive/fake/os.c
@@ -26,33 +26,33 @@
 #include "fake.h"
 
 static int
-FakeInit (void)
+FakeInit(void)
 {
     return 1;
 }
 
 static void
-FakeEnable (void)
+FakeEnable(void)
 {
 }
 
 static Bool
-FakeSpecialKey (KeySym sym)
+FakeSpecialKey(KeySym sym)
 {
     return FALSE;
 }
 
 static void
-FakeDisable (void)
+FakeDisable(void)
 {
 }
 
 static void
-FakeFini (void)
+FakeFini(void)
 {
 }
 
-KdOsFuncs   FakeOsFuncs = {
+KdOsFuncs FakeOsFuncs = {
     FakeInit,
     FakeEnable,
     FakeSpecialKey,
@@ -60,4 +60,3 @@ KdOsFuncs   FakeOsFuncs = {
     FakeFini,
     0
 };
-