Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
commit4962516b2309d76964f9df0d33e74f43b624a42d
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Dec 2011 21:34:44 +0000 (24 13:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Dec 2011 21:34:44 +0000 (24 13:34 -0800)
tree815e16e71e76b2ca6ffc09b176ecfb4263f426df
parent5f0a6e2d503896062f641639dacfe5055c2f593b
parent8a78389651b3e411ec5a7df61404734f52d6f4eb
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  vmwgfx: fix incorrect VRAM size check in vmw_kms_fb_create()
  drm/radeon/kms: bail on BTC parts if MC ucode is missing