Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:41:36 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:41:36 +0000 (10:41 -0700)
commit131f7340b4f93f9a4a8e5a65abbd352b34d0ee08
tree89ea4d409aadff2e264944445f217e7e2cd8ca3d
parent3440625d78711bee41a84cf29c3d8c579b522666
parent17332925d7b11bb6c2d0c49450ae58dd836005da
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: setup MC/VRAM the same way for suspend/resume
  drm/radeon/kms: Fix caching mode selection for GTT object