tree 89ea4d409aadff2e264944445f217e7e2cd8ca3d
parent 3440625d78711bee41a84cf29c3d8c579b522666
parent 17332925d7b11bb6c2d0c49450ae58dd836005da
author Linus Torvalds <torvalds@linux-foundation.org> 1249666896 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249666896 -0700

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