Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:15:02 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:15:02 +0000 (09:15 -0700)
commitd4f452f8259086028aa17d495deb735e056188f4
treebe32c2528446cb0493bbcab583a4c12f95404e3c
parent0d43f5123d1456669b3bbc69854faf6fd5b14caa
parent77de0846aed9d7a1b0ea65090620900d66fb5cfb
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/kms: fix kms/fbdev colormap support properly.
  drm: Add the basic check for the detailed timing in EDID
  drm/radeon/kms: ignore vga arbiter return.