commit 004b35063296b6772fa72404a35b498f1e71e87e
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jan 13 16:13:57 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jan 13 16:13:57 2010 -0800
tree a0053bdaf184ff323c69a865dc30622150628169
parent 6846ee5ca68d81e6baccf0d56221d7a00c1be18b
parent 194fda0dd83623f7927d505e39008c73fbc1c141

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: change drm set mode messages as DRM_DEBUG
  drm: fix crtc no modes printf + typo
  drm/radeon/kms: only evict to GTT if CP is ready
  drm/radeon/kms: Fix crash getting TV info with no BIOS.
  drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
  drm/radeon/kms/r6xx+: make irq handler less verbose
  drm/radeon/kms: fix up LVDS handling on macs (v2)