Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 May 2010 17:12:18 +0000 (10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 May 2010 17:12:18 +0000 (10:12 -0700)
commitfc2a093e7ad23e935aa29e349bc27173c92f1a95
tree3890ad9a113ab199c3b50170d7590c796268f0be
parent9fc282baa8f743a7049e301d13cf9968ee95a91c
parentc9ff04c941d2cd87d27496d7fee8923238bb2ebb
Merge branch 'drm-linus' of git://git./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 3 regressions - since buffer rework