tree 90c7596ee675f2551bea3d4f3b1e62f9f82c679d
parent 28db837693c84bc64e20d84aad00e2c0f206468a
parent c640e8ca172c6a5c45abe8e2e8353900a84427fa
author Linus Torvalds <torvalds@linux-foundation.org> 1300056768 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300056768 -0700

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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