[git pull] drm fixes

Dave Airlie
2012-06-28T12:23:03Z

Hi Linus,

Nearly all intel, one missing license header in nouveau, nothing majorly
earth shattering.

Dave.

The following changes since commit d1346a6cbabf6d377d753f1adc16cb0b305830cc:

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2012-06-26 11:26:50 -0700)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 2266b058d3ab9dfc545305d68e754ad9c9a639a0:

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes (2012-06-27 19:56:20 +0100)

----------------------------------------------------------------

Daniel Vetter (2):
drm/i915: rip out the PM_IIR WARN
Revert "drm/i915: allow PCH PWM override on IVB"

Dave Airlie (2):
drm/nouveau: add license header to prime.
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Takashi Iwai (1):
drm/i915: Fix eDP blank screen after S3 resume on HP desktops

drivers/gpu/drm/i915/i915_irq.c | 1 -
drivers/gpu/drm/i915/i915_suspend.c | 5 ++++-
drivers/gpu/drm/i915/intel_display.c | 16 ----------------
drivers/gpu/drm/nouveau/nouveau_prime.c | 23 +++++++++++++++++++++++
4 files changed, 27 insertions(+), 18 deletions(-)