frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xfree86/scanpci
History
Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
 		2006-12-08 17:24:15 -08: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 2006-12-06 from pciids.sf.net 2006-12-06 07:58:03 -08: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 2006-12-06 from pciids.sf.net 2006-12-06 07:58:03 -08:00