From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jun 2009 22:23:39 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: Ubuntu-5.0.0-8.9~27345
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b63254c71a46d7af2e3f00342b0592dfcd77b342;p=mirror_ubuntu-disco-kernel.git

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: ignore EDID with really tiny modes.
  drm: don't associate _DRM_DRIVER maps with a master
  drm/i915: intel_lvds.c fix section mismatch
  drm: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms.
  drm: set permissions on edid file to 0444
  drm: add newlines to text sysfs files
  drm/radeon: fix ring free alignment calculations
  drm: fix irq naming for kms drivers.
---

b63254c71a46d7af2e3f00342b0592dfcd77b342