Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Mar 2011 22:52:48 +0000 (15:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Mar 2011 22:52:48 +0000 (15:52 -0700)
commit95a17a23a2189512bc76e7a5901521129d7ae9c1
tree90c7596ee675f2551bea3d4f3b1e62f9f82c679d
parent28db837693c84bc64e20d84aad00e2c0f206468a
parentc640e8ca172c6a5c45abe8e2e8353900a84427fa
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon: fix page flipping hangs on r300/r400
  drm/radeon: add pageflip hooks for fusion