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, 11 insertions, 12 deletions

diff --git a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c
index eda466a52..9c6ed4b8d 100644
--- a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c
@@ -43,61 +43,60 @@
 Bool
 xf86GARTCloseScreen(int screenNum)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86AgpGARTSupported()
 {
-	return FALSE;
+    return FALSE;
 }
 
 AgpInfoPtr
 xf86GetAGPInfo(int screenNum)
 {
-	return NULL;
+    return NULL;
 }
 
 Bool
 xf86AcquireGART(int screenNum)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86ReleaseGART(int screenNum)
 {
-	return FALSE;
+    return FALSE;
 }
 
 int
 xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,
-			unsigned long *physical)
+                       unsigned long *physical)
 {
-	return -1;
+    return -1;
 }
 
 Bool
 xf86DeallocateGARTMemory(int screenNum, int key)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86BindGARTMemory(int screenNum, int key, unsigned long offset)
 {
-	return FALSE;
+    return FALSE;
 }
 
-
 Bool
 xf86UnbindGARTMemory(int screenNum, int key)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86EnableAGP(int screenNum, CARD32 mode)
 {
-	return FALSE;
+    return FALSE;
 }