]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 23:14:40 +0000 (16:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 23:14:40 +0000 (16:14 -0700)
commit24010e460454ec0d2f4f0213b667b4349cbdb8e1
tree8c4a839b8094bfdca2115c536fc750d8b3d5cd64
parente4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb
parentcf22f20ade30f8c03955324aaf27b1049e182600
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
drivers/gpu/drm/radeon/radeon_state.c