tree eceb6e49b6752218377a361e7050a3f9f622a44e
parent 4a4565921aa9255be01921ff8ae339fa7b0a5468
parent 2906f0258770d3a9c4e65364df8acc904e148bbe
author Linus Torvalds <torvalds@linux-foundation.org> 1232993771 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232993771 -0800

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/i915: Fix cursor physical address choice to match the 2D driver.
  drm: stash AGP include under the do-we-have-AGP ifdef
  drm: don't whine about not reading EDID data
  drm/i915: hook up LVDS DPMS property
  drm/i915: remove unnecessary debug output in KMS init
  i915: fix freeing path for gem phys objects.
  drm: create mode_config idr lock
  drm: fix leak of device mappings since multi-master changes.