commit | 58e44bafbb601b5abc250cdbb032b1f4022ef30a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 18 15:25:39 2012 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 18 15:25:39 2012 -0800 |
tree | e0b618339c64cf1a372e299a9f262dd7670c0b6e | |
parent | a18d3afefa0104419b5e069af5922bb57a302426 [diff] | |
parent | b7f5b7dec3d539a84734f2bcb7e53fbb1532a40b [diff] |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 3 radeon fixes, I have some exynos fixes to push later but I'll queue them separately once I've looked them over a bit. * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon/kms: fix MSI re-arm on rv370+ drm/radeon/kms/atom: bios scratch reg handling updates drm/radeon/kms: drop lock in return path of radeon_fence_count_emitted.