]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
merge Linus head tree into my drm tree and fix up conflicts
authorDave Airlie <airlied@starflyer.(none)>
Thu, 20 Oct 2005 08:21:33 +0000 (18:21 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 20 Oct 2005 08:21:33 +0000 (18:21 +1000)
commit312f5726055534be1dc9dd369be13aabd2943fcb
tree29394a3f83b4952a73b36a4aa962dfeda839e9db
parent3d5efad953c6d5ba11d5bcb584ef8e906f953a73
parent93918e9afc76717176e9e114e79cdbb602a45ae8
merge Linus head tree into my drm tree and fix up conflicts
drivers/char/drm/drm_drv.c
drivers/char/drm/drm_proc.c
drivers/char/drm/drm_stub.c
drivers/char/drm/mga_dma.c