Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:51:15 +0000 (19:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:51:15 +0000 (19:51 -0800)
commit76212a840f6edc2b89865f09464f3bd90125896d
tree958596e5cb3dfa872e8c666aecdf99809ede1148
parente04984c8394b17bab85c28956ada6aba81cdf746
parente803e8b2628f3e9a42f45c5b7bb1f9821b08352c
Merge branch 'drm-linus' of git://git./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.