From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jan 2009 16:39:52 +0000 (-0800)
Subject: Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4c44323db15f26f4c744f06179daa43711cdb708;p=deliverable%2Flinux.git

Merge branch 'drm-next' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: lock correct mutex around object unreference.
  drm/i915: add support for physical memory objects
  drm/i915: make LVDS fixed mode a preferred mode
  drm: handle depth & bpp changes correctly
  drm: initial KMS config fixes
  drm/i915: setup sarea properly in master_priv
  drm/i915: set vblank enabled flag correctly across IRQ install/uninstall
  drm/i915: don't enable vblanks on disabled pipes
---

4c44323db15f26f4c744f06179daa43711cdb708