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)
commit950709a8961e2dde05bc55dca29b2d2e54a6d3ec
treef7f43152e3d49c36ba74d2fcb340c2f25ea6ae55
parent41bc3982b99973d93b5c49598ebd1c34a21127af
parent5d23fafb1bf8ef071738026c2e5071a92186d5f8
Merge branch 'drm-patches' of git://git./linux/kernel/git/airlied/drm-2.6

* '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