author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 28 Oct 2010 03:37:06 +0000 (20:37 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 28 Oct 2010 03:37:06 +0000 (20:37 -0700) |
* '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
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
Trivial merge