From: Dave Airlie Date: Wed, 27 Jun 2012 18:56:20 +0000 (+0100) Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2266b058d3ab9dfc545305d68e754ad9c9a639a0;p=linux-beck.git Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Daniel writes: "Two tiny patches and one revert: - Kill a bogus error message introduced in 3.4, further Bspec reading indicates that this is how the hw is supposed to work. - Reorder one backlight register restore, fixing broken backlight on some machines after resume. - Revert a hack from Jesse for ivb backlight control - it breaks the backlight controls on my shiny new ivb laptop." * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: Revert "drm/i915: allow PCH PWM override on IVB" drm/i915: Fix eDP blank screen after S3 resume on HP desktops drm/i915: rip out the PM_IIR WARN --- 2266b058d3ab9dfc545305d68e754ad9c9a639a0