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

2 files changed, 21 insertions, 19 deletions

diff --git a/xorg-server/hw/xfree86/int10/stub.c b/xorg-server/hw/xfree86/int10/stub.c
index 58b65782c..8fd079069 100644
--- a/xorg-server/hw/xfree86/int10/stub.c
+++ b/xorg-server/hw/xfree86/int10/stub.c
@@ -38,7 +38,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
 }
 
 void *
-xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
+xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
 {
     *off = 0;
     return NULL;
diff --git a/xorg-server/hw/xfree86/int10/xf86x86emu.c b/xorg-server/hw/xfree86/int10/xf86x86emu.c
index 83663b0e6..0f8737b49 100644
--- a/xorg-server/hw/xfree86/int10/xf86x86emu.c
+++ b/xorg-server/hw/xfree86/int10/xf86x86emu.c
@@ -24,7 +24,7 @@ x86emu_do_int(int num)
     Int10Current->num = num;
 
     if (!int_handler(Int10Current)) {
-	X86EMU_halt_sys();
+        X86EMU_halt_sys();
     }
 }
 
@@ -34,10 +34,10 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt)
     int sig = setup_int(pInt);
 
     if (sig < 0)
-	return;
+        return;
 
     if (int_handler(pInt)) {
-	X86EMU_exec();
+        X86EMU_exec();
     }
 
     finish_int(pInt, sig);
@@ -48,33 +48,34 @@ xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
 {
     int i;
     X86EMU_intrFuncs intFuncs[256];
+
     X86EMU_pioFuncs pioFuncs = {
-	(&x_inb),
-	(&x_inw),
-	(&x_inl),
-	(&x_outb),
-	(&x_outw),
-	(&x_outl)
+        (&x_inb),
+        (&x_inw),
+        (&x_inl),
+        (&x_outb),
+        (&x_outw),
+        (&x_outl)
     };
 
     X86EMU_memFuncs memFuncs = {
-	(&Mem_rb),
-	(&Mem_rw),
-	(&Mem_rl),
-	(&Mem_wb),
-	(&Mem_ww),
-	(&Mem_wl)
+        (&Mem_rb),
+        (&Mem_rw),
+        (&Mem_rl),
+        (&Mem_wb),
+        (&Mem_ww),
+        (&Mem_wl)
     };
 
     X86EMU_setupMemFuncs(&memFuncs);
 
     pInt->cpuRegs = &M;
     M.mem_base = 0;
-    M.mem_size = 1024*1024 + 1024;
+    M.mem_size = 1024 * 1024 + 1024;
     X86EMU_setupPioFuncs(&pioFuncs);
 
-    for (i=0;i<256;i++)
-	intFuncs[i] = x86emu_do_int;
+    for (i = 0; i < 256; i++)
+        intFuncs[i] = x86emu_do_int;
     X86EMU_setupIntrFuncs(intFuncs);
     return TRUE;
 }
@@ -83,6 +84,7 @@ void
 printk(const char *fmt, ...)
 {
     va_list argptr;
+
     va_start(argptr, fmt);
     VErrorF(fmt, argptr);
     va_end(argptr);