xserver/hw/xfree86/scanpci
Ian Romanick 8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/scanpci/extrapci.ids
	hw/xfree86/scanpci/pci.ids
	hw/xfree86/scanpci/pciid2c.pl
	hw/xfree86/scanpci/xf86PciStdIds.h
2006-10-24 08:57:59 -07:00
..
extrapci.ids Update pci.ids to Tue 2006-10-03 daily snapshot 2006-10-03 17:49:48 -07:00
pci.ids Update pci.ids to Tue 2006-10-03 daily snapshot 2006-10-03 17:49:48 -07:00
pciid2c.pl Don't insert RCS tag into generated pci id header files 2006-10-03 17:48:50 -07:00
xf86PciStdIds.h Update pci.ids to Tue 2006-10-03 daily snapshot 2006-10-03 17:49:48 -07:00