From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 May 2011 23:59:51 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c191f6ccee11b79fb562c36007a5af31c705c9e2;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/keithp/linux-2.6

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915/lvds: Only act on lid notify when the device is on
  drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"
  drm/i915: Only enable the plane after setting the fb base (pre-ILK)
  drm/i915/dp: Be paranoid in case we disable a DP before it is attached
  drm/i915: Release object along create user fb error path
---

c191f6ccee11b79fb562c36007a5af31c705c9e2