| commit | 76212a840f6edc2b89865f09464f3bd90125896d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:51:15 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:51:15 2010 -0800 |
| tree | 958596e5cb3dfa872e8c666aecdf99809ede1148 | |
| parent | e04984c8394b17bab85c28956ada6aba81cdf746 [diff] | |
| parent | e803e8b2628f3e9a42f45c5b7bb1f9821b08352c [diff] |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: make sure retry count increases. drm/radeon/kms/atom: use get_unaligned_le32() for ctx->ps drm/ttm: Fix a bug occuring when validating a buffer object in a range. drm: Fix a bug in the range manager.