From: Linus Torvalds Date: Sat, 24 Dec 2011 21:34:44 +0000 (-0800) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4962516b2309d76964f9df0d33e74f43b624a42d;p=~shefty%2Frdma-dev.git 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 --- 4962516b2309d76964f9df0d33e74f43b624a42d