diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-25 11:30:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-25 11:30:04 -0700 |
| commit | 380b51d605a82c98082a2cebd70a0d1d0735eaa7 (patch) | |
| tree | ad8dce1ce07ab02885e41baa647ca9324522a1e2 /hw/xfree86/os-support/linux/int10 | |
| parent | 82f6b7e75e04e3fb951ab71ad3c553c8b34ea995 (diff) | |
| parent | 8977b07434d75ca396d236dc1324f0c862b633c7 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Init.c
hw/xfree86/int10/pci.c
hw/xfree86/scanpci/xf86PciData.h
hw/xfree86/scanpci/xf86PciStdIds.h
hw/xfree86/scanpci/xf86PciStr.h
hw/xfree86/scanpci/xf86ScanPci.h
hw/xfree86/utils/pcitweak/pcitweak.c
hw/xfree86/utils/scanpci/scanpci.c
Re-removed most of the conflicting files.
Diffstat (limited to 'hw/xfree86/os-support/linux/int10')
| -rw-r--r-- | hw/xfree86/os-support/linux/int10/linux.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index b83be1f8e..3bab5e7b0 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.32 2004/02/05 18:24:59 eich Exp $ */ /* * linux specific part of the int10 module * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich |