From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Aug 2009 17:41:36 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.31-rc6~47
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=131f7340b4f93f9a4a8e5a65abbd352b34d0ee08;p=~shefty%2Frdma-dev.git

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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
---

131f7340b4f93f9a4a8e5a65abbd352b34d0ee08