Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
commit23e041dbaa80eb1032f9d612433c6b9062da5afd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:54:10 +0000 (30 13:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:54:10 +0000 (30 13:54 -0800)
tree40783f4dff7c887e424c2466d7b74deb2c019a64
parentf50733450362182fd16d658751615635850a8bff
parent5349ef3127c77075ff70b2014f17ae0fbcaaf199
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/fb: fix FBIOGET/PUT_VSCREENINFO pixel clock handling
  drm: make sure page protections are updated after changing vm_flags
  drm/radeon/kms: Report vga connector is connected according to ddc_probe
  drm: mm always protect change to unused_nodes with unused_lock spinlock
  drm/radeon/kms: Disable TV load detect on RS400,RC410,RS480
  drm/radeon/kms: read back register before writing in IIO.
  drm/radeon/kms: fix handling of d1/d2 vga
  drm: work around EDIDs with bad htotal/vtotal values
  drm/radeon/kms: resume AGP by calling init.