Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 03:37:06 +0000 (20:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 03:37:06 +0000 (20:37 -0700)
commitb83db1deb29eb4eea9bf5992431d26978e039ce6
treea59a4d94c41de6889be93b6963c791aa64181f25
parent7d2f280e75f05919314e250cadf361a327ed555c
parent7e94250312d8b32a18e7e96cee19f2795d224e8c
Merge branch 'drm-core-next' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: enable unmappable vram for evergreen
  drm/radeon/kms: fix tiled db height calculation on 6xx/7xx
  drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx