Merge with 4.0
authorJeff Hartmann <jhartmann@valinux.com>
Thu, 16 Mar 2000 03:37:30 +0000 (03:37 +0000)
committerJeff Hartmann <jhartmann@valinux.com>
Thu, 16 Mar 2000 03:37:30 +0000 (03:37 +0000)
commit5bd8014f276d447178a1193d9dea1b976647d6ce
treecafe59205a3cf689f2efc31f2c8da11ce2c53e3e
parentadc03d3661117a687b5e1686f11b4b1314922203
Merge with 4.0
19 files changed:
libdrm/xf86drm.c
linux-core/drmP.h
linux-core/tdfx_drv.c
linux/Makefile.linux
linux/bufs.c
linux/dma.c
linux/drm.h
linux/drmP.h
linux/fops.c
linux/gamma_drv.c
linux/lists.c
linux/lock.c
linux/memory.c
linux/proc.c
linux/tdfx_drv.c
linux/vm.c
shared-core/drm.h
shared/drm.h
tests/drmstat.c