xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/os-support/Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 28337cc1060bc08adef81c304dd9ed02d0a0e37b (from e1720b1089328af80ca0cb85e5289ced05263f95)
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 9 19:51:17 2006 -0800

    Fix typo before the last commit.

diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index 5ade7e8..6346d1c 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -1,4 +1,4 @@
-t -SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
+SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
 DIST_SUBDIRS = bsd bus misc linux lynxos solaris sysv sco usl hurd
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \