tree 815e16e71e76b2ca6ffc09b176ecfb4263f426df
parent 5f0a6e2d503896062f641639dacfe5055c2f593b
parent 8a78389651b3e411ec5a7df61404734f52d6f4eb
author Linus Torvalds <torvalds@linux-foundation.org> 1324762484 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1324762484 -0800

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