summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-16 04:51:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-16 04:51:15 +0100
commit76212a840f6edc2b89865f09464f3bd90125896d (patch)
tree958596e5cb3dfa872e8c666aecdf99809ede1148 /kernel
parentMerge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentdrm/radeon/kms: make sure retry count increases. (diff)
downloadlinux-76212a840f6edc2b89865f09464f3bd90125896d.tar.xz
linux-76212a840f6edc2b89865f09464f3bd90125896d.zip
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.
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions