Merge mga-1-0-0-branch into trunk.
authorGareth Hughes <gareth@users.sourceforge.net>
Thu, 15 Feb 2001 08:12:14 +0000 (08:12 +0000)
committerGareth Hughes <gareth@users.sourceforge.net>
Thu, 15 Feb 2001 08:12:14 +0000 (08:12 +0000)
commit360475376c5a597caf4a981c934a6b0d783fa94d
tree433f6970813deb74a2c8e1636b772a1f8567b267
parent38c22bc4883ac201bde7f5f130a72acd1be68ec5
Merge mga-1-0-0-branch into trunk.
91 files changed:
libdrm/xf86drm.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_agpsupport.c [moved from linux/agpsupport.c with 75% similarity]
linux-core/drm_auth.c [moved from linux/auth.c with 74% similarity]
linux-core/drm_bufs.c [new file with mode: 0644]
linux-core/drm_context.c [new file with mode: 0644]
linux-core/drm_dma.c [moved from linux/dma.c with 76% similarity]
linux-core/drm_drawable.c [moved from linux/drawable.c with 75% similarity]
linux-core/drm_drv.c [new file with mode: 0644]
linux-core/drm_fops.c [moved from linux/fops.c with 89% similarity]
linux-core/drm_init.c [moved from linux/init.c with 83% similarity]
linux-core/drm_ioctl.c [new file with mode: 0644]
linux-core/drm_lock.c [moved from linux/lock.c with 77% similarity]
linux-core/drm_memory.h [moved from linux/memory.c with 57% similarity]
linux-core/drm_proc.c [moved from linux/proc.c with 64% similarity]
linux-core/drm_stub.c [new file with mode: 0644]
linux-core/drm_vm.c [moved from linux/vm.c with 84% similarity]
linux-core/i810_dma.c
linux-core/i810_drv.c
linux-core/i810_drv.h
linux-core/mga_drv.c
linux-core/r128_drv.c
linux-core/radeon_drv.c
linux-core/tdfx_drv.c
linux/Makefile.kernel
linux/Makefile.linux
linux/bufs.c [deleted file]
linux/ctxbitmap.c [deleted file]
linux/drm.h
linux/drmP.h
linux/drm_agpsupport.h [new file with mode: 0644]
linux/drm_auth.h [new file with mode: 0644]
linux/drm_bufs.h [new file with mode: 0644]
linux/drm_context.h [new file with mode: 0644]
linux/drm_dma.h [new file with mode: 0644]
linux/drm_drawable.h [new file with mode: 0644]
linux/drm_drv.h [new file with mode: 0644]
linux/drm_fops.h [new file with mode: 0644]
linux/drm_init.h [new file with mode: 0644]
linux/drm_ioctl.h [new file with mode: 0644]
linux/drm_lists.h [moved from linux/lists.c with 78% similarity]
linux/drm_lock.h [new file with mode: 0644]
linux/drm_memory.h [new file with mode: 0644]
linux/drm_proc.h [new file with mode: 0644]
linux/drm_stub.h [new file with mode: 0644]
linux/drm_vm.h [new file with mode: 0644]
linux/gamma.h [new file with mode: 0644]
linux/gamma_context.c [moved from linux/context.c with 91% similarity]
linux/gamma_dma.c
linux/gamma_drm.c [new file with mode: 0644]
linux/gamma_drv.c
linux/gamma_drv.h
linux/i810.h [new file with mode: 0644]
linux/i810_bufs.c [deleted file]
linux/i810_context.c [deleted file]
linux/i810_dma.c
linux/i810_drv.c
linux/i810_drv.h
linux/ioctl.c [deleted file]
linux/mga.h [new file with mode: 0644]
linux/mga_bufs.c [deleted file]
linux/mga_context.c [deleted file]
linux/mga_dma.c
linux/mga_drm.h
linux/mga_drv.c
linux/mga_drv.h
linux/mga_state.c
linux/mga_ucode.h [new file with mode: 0644]
linux/mga_warp.c [new file with mode: 0644]
linux/r128.h [new file with mode: 0644]
linux/r128_cce.c
linux/r128_context.c [deleted file]
linux/r128_drm.h
linux/r128_drv.c
linux/r128_drv.h
linux/r128_state.c
linux/radeon.h [new file with mode: 0644]
linux/radeon_bufs.c [deleted file]
linux/radeon_context.c [deleted file]
linux/radeon_cp.c
linux/radeon_drv.c
linux/radeon_drv.h
linux/radeon_state.c
linux/tdfx.h [new file with mode: 0644]
linux/tdfx_context.c [deleted file]
linux/tdfx_drv.c
linux/tdfx_drv.h [deleted file]
shared-core/drm.h
shared/drm.h
tests/dristat.c [new file with mode: 0644]