diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 15:51:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 15:51:26 -0800 |
| commit | b5f7376eb30538d03dd27f6a59b5b2d28587967c (patch) | |
| tree | 52c6dfec1e3002db5ff43e428b3ced4e143c391a /fs/locks.c | |
| parent | 57949e8006de9643ac95447143e0211be3ff5f81 (diff) | |
| parent | 49495d44dfa4ba76cf7d1ed8fe84746dd9552255 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
amd64-agp: fix crash at second module load
drm/radeon: fix regression with AA resolve checking
drm: drop commented out code and preceding comment
drm/vblank: Enable precise vblank timestamps for interlaced and doublescan modes.
drm/vblank: Use memory barriers optimized for atomic_t instead of generics.
drm/vblank: Use abs64(diff_ns) for s64 diff_ns instead of abs(diff_ns)
drm/radeon/kms: align height of fb allocation.
Revert "drm/radeon/kms: switch back to min->max pll post divider iteration"
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions