From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 May 2010 23:14:40 +0000 (-0700)
Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
X-Git-Tag: v2.6.35-rc1~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=24010e460454ec0d2f4f0213b667b4349cbdb8e1;p=linux.git

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
---

24010e460454ec0d2f4f0213b667b4349cbdb8e1