Ian Romanick 8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework ... Conflicts: hw/xfree86/common/xf86.h hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c hw/xfree86/int10/generic.c hw/xfree86/int10/helper_exec.c hw/xfree86/loader/xf86sym.c hw/xfree86/os-support/bus/Pci.c hw/xfree86/os-support/bus/Pci.h hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/os-support/linux/int10/linux.c		2007-08-23 18:19:17 -07:00
..
int10	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2007-08-23 18:19:17 -07:00
lnx_acpi.c	xfree86/linux acpi: fix tokenising	2006-11-08 18:00:52 +02:00
lnx_agp.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
lnx_apm.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
lnx_axp.c	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2007-08-23 18:19:17 -07:00
lnx_bell.c	Convert all my license statements to the standard form	2007-08-01 01:53:31 +03:00
lnx_ev56.c	lnx_ev56.c has to be built with -mcpu=ev56. Fix it.	2007-01-10 16:04:20 +00:00
lnx_font.c	Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.	2005-07-03 07:02:09 +00:00
lnx_ia64.c	typo fix	2005-08-30 19:35:06 +00:00
lnx_init.c	Death to RCS tags.	2007-06-29 14:06:52 -04:00
lnx_jstk.c	Death to RCS tags.	2007-06-29 14:06:52 -04:00
lnx_kmod.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
lnx_mouse.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
lnx_pci.c	Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework	2006-12-08 17:24:15 -08:00
lnx_video.c	Fix an error message to not point to @xfree86.org.	2007-08-21 10:44:37 -04:00
lnx.h	Fix alpha build failures	2007-07-19 20:37:26 -04:00
lnxResource.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
Makefile.am	xfree86: Fix build on Linux/alpha.	2007-08-21 00:26:33 +02:00