drm: merge in Linus mainline
authorDave Airlie <airlied@starflyer.(none)>
Tue, 3 Jan 2006 07:18:01 +0000 (18:18 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 3 Jan 2006 07:18:01 +0000 (18:18 +1100)
commit97f2aab6698f3ab2552c41c1024a65ffd0763a6d
treebb6e3b2949459f54f884c710fc74d40eef00d834
parentd985c1088146607532093d9eaaaf99758f6a4d21
parent88026842b0a760145aa71d69e74fbc9ec118ca44
drm: merge in Linus mainline
drivers/char/drm/drm_lock.c
drivers/char/drm/drm_memory.c
drivers/char/drm/drm_memory_debug.h
drivers/char/drm/mga_drv.c
drivers/char/drm/radeon_drv.h