Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 15:49:43 +0000 (07:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 15:49:43 +0000 (07:49 -0800)
commitcf41f8ac386e8d62122e7e394b4c6b3e3ab30ede
tree57a286c05baa4356da2e90178c7d99122de61399
parent0271fc2db6260dd46f196191e24281af2fddb879
parent30e2fb188194908e48d3f27a53ccea6740eb1e98
Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6