Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Mar 2011 18:17:43 +0000 (11:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Mar 2011 18:17:43 +0000 (11:17 -0700)
commit215fd2fa8879247ac6e3af1dc44af7cae8c06f1e
tree0d32dd1a8ff736a8b3a35df51256ab763c8daee9
parent786c58b7275ae885a3cee9d5bcf8721d962861ac
parent5359533801e3dd3abca5b7d3d985b0b33fd9fe8b
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: fix problem with changing active VRAM size. (v2)