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 |
||
|---|---|---|
| .. | ||
| extrapci.ids | ||
| pci.ids | ||
| pciid2c.pl | ||
| xf86PciStdIds.h | ||