Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 23 Apr 2006 16:41:20 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 23 Apr 2006 16:41:20 +0000 (09:41 -0700)
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: possible cleanups
  drm: fixup r300 scratch on BE machines


Trivial merge