diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-24 13:34:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-24 13:34:44 -0800 |
| commit | 4962516b2309d76964f9df0d33e74f43b624a42d (patch) | |
| tree | 815e16e71e76b2ca6ffc09b176ecfb4263f426df /fs/locks.c | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
| parent | 8a78389651b3e411ec5a7df61404734f52d6f4eb (diff) | |
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 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions