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, 58 insertions, 58 deletions

diff --git a/xorg-server/Xext/xselinux.h b/xorg-server/Xext/xselinux.h
index 57239821e..5be7088c8 100644
--- a/xorg-server/Xext/xselinux.h
+++ b/xorg-server/Xext/xselinux.h
@@ -53,87 +53,87 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define X_SELinuxGetClientContext		22
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   SELinuxReqType;
-    CARD16  length;
-    CARD8   client_major;
-    CARD8   client_minor;
+    CARD8 reqType;
+    CARD8 SELinuxReqType;
+    CARD16 length;
+    CARD8 client_major;
+    CARD8 client_minor;
 } SELinuxQueryVersionReq;
 
 typedef struct {
-    CARD8   type;
-    CARD8   pad1;
-    CARD16  sequenceNumber;
-    CARD32  length;
-    CARD16  server_major;
-    CARD16  server_minor;
-    CARD32  pad2;
-    CARD32  pad3;
-    CARD32  pad4;
-    CARD32  pad5;
-    CARD32  pad6; 
+    CARD8 type;
+    CARD8 pad1;
+    CARD16 sequenceNumber;
+    CARD32 length;
+    CARD16 server_major;
+    CARD16 server_minor;
+    CARD32 pad2;
+    CARD32 pad3;
+    CARD32 pad4;
+    CARD32 pad5;
+    CARD32 pad6;
 } SELinuxQueryVersionReply;
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   SELinuxReqType;
-    CARD16  length;
-    CARD32  context_len;
+    CARD8 reqType;
+    CARD8 SELinuxReqType;
+    CARD16 length;
+    CARD32 context_len;
 } SELinuxSetCreateContextReq;
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   SELinuxReqType;
-    CARD16  length;
+    CARD8 reqType;
+    CARD8 SELinuxReqType;
+    CARD16 length;
 } SELinuxGetCreateContextReq;
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   SELinuxReqType;
-    CARD16  length;
-    CARD32  id;
-    CARD32  context_len;
+    CARD8 reqType;
+    CARD8 SELinuxReqType;
+    CARD16 length;
+    CARD32 id;
+    CARD32 context_len;
 } SELinuxSetContextReq;
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   SELinuxReqType;
-    CARD16  length;
-    CARD32  id;
+    CARD8 reqType;
+    CARD8 SELinuxReqType;
+    CARD16 length;
+    CARD32 id;
 } SELinuxGetContextReq;
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   SELinuxReqType;
-    CARD16  length;
-    CARD32  window;
-    CARD32  property;
+    CARD8 reqType;
+    CARD8 SELinuxReqType;
+    CARD16 length;
+    CARD32 window;
+    CARD32 property;
 } SELinuxGetPropertyContextReq;
 
 typedef struct {
-    CARD8   type;
-    CARD8   pad1;
-    CARD16  sequenceNumber;
-    CARD32  length;
-    CARD32  context_len;
-    CARD32  pad2;
-    CARD32  pad3;
-    CARD32  pad4;
-    CARD32  pad5;
-    CARD32  pad6;
+    CARD8 type;
+    CARD8 pad1;
+    CARD16 sequenceNumber;
+    CARD32 length;
+    CARD32 context_len;
+    CARD32 pad2;
+    CARD32 pad3;
+    CARD32 pad4;
+    CARD32 pad5;
+    CARD32 pad6;
 } SELinuxGetContextReply;
 
 typedef struct {
-    CARD8   type;
-    CARD8   pad1;
-    CARD16  sequenceNumber;
-    CARD32  length;
-    CARD32  count;
-    CARD32  pad2;
-    CARD32  pad3;
-    CARD32  pad4;
-    CARD32  pad5;
-    CARD32  pad6;
+    CARD8 type;
+    CARD8 pad1;
+    CARD16 sequenceNumber;
+    CARD32 length;
+    CARD32 count;
+    CARD32 pad2;
+    CARD32 pad3;
+    CARD32 pad4;
+    CARD32 pad5;
+    CARD32 pad6;
 } SELinuxListItemsReply;
 
-#endif /* _XSELINUX_H */
+#endif                          /* _XSELINUX_H */