Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 15:22:50 +0000 (08:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 15:22:50 +0000 (08:22 -0700)
commit0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a
tree5e576c9cca633f37790effd1a25ec87f515e39de
parentb91ce4d14a21fc04d165be30319541e0f9204f15
parent88b045077a1462a47503137fd4ca0c31772819ca
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 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
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r420.c
drivers/gpu/drm/radeon/radeon_kms.c