Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Oct 2010 23:34:46 +0000 (16:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Oct 2010 23:34:46 +0000 (16:34 -0700)
commita56f31a0c6a08faeca5f0c5e64c6a0113c43181b
treeceb249a494406ed11a0fde86b5f075c0b8ce06fe
parent509d4486bd86f17b17f5134d02bc3586569f9678
parenta8c051f0c8d2f81c665e820f765aaddf86161640
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: Silent spurious error message
  drm/radeon/kms: fix bad cast/shift in evergreen.c
  drm/radeon/kms: make TV/DFP table info less verbose
  drm/radeon/kms: leave certain CP int bits enabled
  drm/radeon/kms: avoid corner case issue with unmappable vram V2