Merge DRI CVS tree into standard kernel
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 24 May 2002 03:48:57 +0000 (20:48 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 24 May 2002 03:48:57 +0000 (20:48 -0700)
commit6177c8bb7d854b5b21b3fcd1713f41b5f7fd9088
tree5edcfd875f2678fa922a8785a4be433eb679b33b
parenta58a63c3e7aeb1916d1ec6a50e40189bc9d941cd
Merge DRI CVS tree into standard kernel
46 files changed:
drivers/char/drm/Config.in
drivers/char/drm/Makefile
drivers/char/drm/drm.h
drivers/char/drm/drmP.h
drivers/char/drm/drm_agpsupport.h
drivers/char/drm/drm_auth.h
drivers/char/drm/drm_bufs.h
drivers/char/drm/drm_context.h
drivers/char/drm/drm_dma.h
drivers/char/drm/drm_drv.h
drivers/char/drm/drm_fops.h
drivers/char/drm/drm_lists.h
drivers/char/drm/drm_memory.h
drivers/char/drm/drm_scatter.h
drivers/char/drm/drm_stub.h
drivers/char/drm/drm_vm.h
drivers/char/drm/gamma.h
drivers/char/drm/gamma_dma.c
drivers/char/drm/gamma_drm.h [new file with mode: 0644]
drivers/char/drm/gamma_drv.c
drivers/char/drm/gamma_drv.h
drivers/char/drm/i810.h
drivers/char/drm/i810_dma.c
drivers/char/drm/i810_drm.h
drivers/char/drm/i810_drv.c
drivers/char/drm/i810_drv.h
drivers/char/drm/i830.h [new file with mode: 0644]
drivers/char/drm/i830_dma.c [new file with mode: 0644]
drivers/char/drm/i830_drm.h [new file with mode: 0644]
drivers/char/drm/i830_drv.c [new file with mode: 0644]
drivers/char/drm/i830_drv.h [new file with mode: 0644]
drivers/char/drm/mga_state.c
drivers/char/drm/r128_drv.c
drivers/char/drm/r128_state.c
drivers/char/drm/radeon_cp.c
drivers/char/drm/radeon_drm.h
drivers/char/drm/radeon_drv.c
drivers/char/drm/radeon_drv.h
drivers/char/drm/radeon_state.c
drivers/char/drm/sis.h [new file with mode: 0644]
drivers/char/drm/sis_drm.h [new file with mode: 0644]
drivers/char/drm/sis_drv.c [new file with mode: 0644]
drivers/char/drm/sis_drv.h [new file with mode: 0644]
drivers/char/drm/sis_ds.c [new file with mode: 0644]
drivers/char/drm/sis_ds.h [new file with mode: 0644]
drivers/char/drm/sis_mm.c [new file with mode: 0644]