Merged mga branch with trunk
authorJeff Hartmann <jhartmann@valinux.com>
Tue, 4 Apr 2000 22:08:14 +0000 (22:08 +0000)
committerJeff Hartmann <jhartmann@valinux.com>
Tue, 4 Apr 2000 22:08:14 +0000 (22:08 +0000)
commitba1b1ae3806490cce16a9c8957b52cd74967f463
treeec80e9e61fac3a0f1a0eafaedef239c419a89403
parent7d715d1800031ccbd37db7f88896464c0e838f10
Merged mga branch with trunk
44 files changed:
libdrm/xf86drm.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/i810_dma.c
linux-core/i810_drm.h [new file with mode: 0644]
linux-core/i810_drv.c
linux-core/i810_drv.h
linux-core/mga_drv.c
linux-core/tdfx_drv.c
linux/Makefile.kernel
linux/Makefile.linux
linux/agpsupport.c
linux/bufs.c
linux/ctxbitmap.c
linux/dma.c
linux/drm.h
linux/drmP.h
linux/gamma_drv.c
linux/i810_bufs.c
linux/i810_context.c [new file with mode: 0644]
linux/i810_dma.c
linux/i810_drm.h [new file with mode: 0644]
linux/i810_drv.c
linux/i810_drv.h
linux/memory.c
linux/mga_bufs.c
linux/mga_clear.c [deleted file]
linux/mga_context.c
linux/mga_dma.c
linux/mga_dma.h [deleted file]
linux/mga_drm.h [moved from linux/mga_drm_public.h with 53% similarity]
linux/mga_drv.c
linux/mga_drv.h
linux/mga_state.c
linux/mga_state.h [deleted file]
linux/mgareg_flags.h [deleted file]
linux/picker.c
linux/proc.c
linux/tdfx_context.c
linux/tdfx_drv.c
linux/vm.c
shared-core/drm.h
shared/drm.h
tests/drmstat.c