diff options
| author | Jeff Hartmann <jhartmann@valinux.com> | 2000-03-16 03:37:30 +0000 |
|---|---|---|
| committer | Jeff Hartmann <jhartmann@valinux.com> | 2000-03-16 03:37:30 +0000 |
| commit | 5bd8014f276d447178a1193d9dea1b976647d6ce (patch) | |
| tree | cafe59205a3cf689f2efc31f2c8da11ce2c53e3e /linux-core | |
| parent | adc03d3661117a687b5e1686f11b4b1314922203 (diff) | |
Merge with 4.0
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 3 | ||||
| -rw-r--r-- | linux-core/tdfx_drv.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 25c35425..312fba36 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -24,8 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.5 2000/02/14 06:27:26 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.6 2000/02/23 04:47:27 martin Exp $ * */ diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index 61c917eb..57c1c719 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -24,8 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $PI$ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.2 2000/01/20 07:25:36 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.3 2000/02/23 04:47:31 martin Exp $ * */ |