tree 5e576c9cca633f37790effd1a25ec87f515e39de
parent b91ce4d14a21fc04d165be30319541e0f9204f15
parent 88b045077a1462a47503137fd4ca0c31772819ca
author Linus Torvalds <torvalds@linux-foundation.org> 1272381770 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272381770 -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 sparc regression in r300_scratch()
  drm: make sure vblank interrupts are disabled at DPMS time
  drm/radeon/kms/evergreen: No EnableYUV table
  drm/radeon: 9800 SE has only one quadpipe
  drm/radeon/kms: don't print error for legal crtcs.
  drm/radeon/kms/evergreen: fix LUT setup