diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-24 22:34:44 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-24 22:34:44 +0100 |
commit | 4962516b2309d76964f9df0d33e74f43b624a42d (patch) | |
tree | 815e16e71e76b2ca6ffc09b176ecfb4263f426df /fs/locks.c | |
parent | Linux 3.2-rc7 (diff) | |
parent | vmwgfx: fix incorrect VRAM size check in vmw_kms_fb_create() (diff) | |
download | linux-4962516b2309d76964f9df0d33e74f43b624a42d.tar.xz linux-4962516b2309d76964f9df0d33e74f43b624a42d.zip |
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions