Merge branch 'drm-linus' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 26 Nov 2005 00:48:48 +0000 (16:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 26 Nov 2005 00:48:48 +0000 (16:48 -0800)

Trivial merge