Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 26 Jun 2005 16:55:39 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 26 Jun 2005 16:55:39 +0000 (09:55 -0700)

Trivial merge