From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Mar 2011 18:17:43 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.38~7
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=215fd2fa8879247ac6e3af1dc44af7cae8c06f1e;p=~andy%2Flinux

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: fix problem with changing active VRAM size. (v2)
---

215fd2fa8879247ac6e3af1dc44af7cae8c06f1e