summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-28 16:14:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-28 16:14:40 -0700
commit24010e460454ec0d2f4f0213b667b4349cbdb8e1 (patch)
tree8c4a839b8094bfdca2115c536fc750d8b3d5cd64 /kernel
parente4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb (diff)
parentcf22f20ade30f8c03955324aaf27b1049e182600 (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: fix the r100/r200 ums block 0 page fix
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions