tree 8c4a839b8094bfdca2115c536fc750d8b3d5cd64
parent e4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb
parent cf22f20ade30f8c03955324aaf27b1049e182600
author Linus Torvalds <torvalds@linux-foundation.org> 1275088480 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275088480 -0700

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