xserver: Branch 'master' - 2 commits

[Greg Kroah-Hartman]

 .gitignore                     |    1 +
 hw/xfree86/common/xf86Config.c |    1 +
 2 files changed, 2 insertions(+)

New commits:
diff-tree eb35f812a5b65adcc5f6cbb91b31b69cae5d7f3d (from 863f5cc31b747bc9f2fcd6a9e20c613a11733bf4)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jul 5 13:27:26 2006 -0700

    add another file to .gitignore

diff --git a/.gitignore b/.gitignore
index 1e79706..4118cd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,7 @@ hw/xfree86/doc/man/Xorg.man
 hw/xfree86/doc/man/xorg.conf.5x
 hw/xfree86/doc/man/xorg.conf.man
 hw/xfree86/exa/exa.4
+hw/xfree86/exa/exa.4x
 hw/xfree86/exa/exa.man
 hw/xfree86/fbdevhw/fbdevhw.4x
 hw/xfree86/fbdevhw/fbdevhw.man
diff-tree 863f5cc31b747bc9f2fcd6a9e20c613a11733bf4 (from f059b61ab3af25b03c704669eddb838d3ce4366c)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jul 5 13:26:34 2006 -0700

    fix compiler warning in hw/xfree86/common/xf86Config.c

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index d9f1dd9..bcad246 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -75,6 +75,7 @@ extern DeviceAssocRec mouse_assoc;
 #endif
 
 #ifdef XKB
+#undef XKB_IN_SERVER
 #define XKB_IN_SERVER
 #include <X11/extensions/XKBsrv.h>
 #endif