Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 11 Jun 2005 03:23:21 +0000 (20:23 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 11 Jun 2005 03:23:21 +0000 (20:23 -0700)

Trivial merge