tree 60180e188c9c9dfc5055cbaf2e1eccaadcaa8e22
parent 708f04d2abf4e90abee61d9ffb1f165038017ecf
parent 004e5cf743086990e5fc04a14437b3966d7fa9a2
author Linus Torvalds <torvalds@linux-foundation.org> 1395379948 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1395379948 -0700

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Some final few intel fixes, all regressions, all stable cc, and one
  exynos oops fixer.

  The biggest is probably the intel display error irqs one, but it seems
  to fix a few crashes on startup, and one use after free in drm core"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/exynos: Fix (more) freeing issues in exynos_drm_drv.c
  drm/i915: Disable stolen memory when DMAR is active
  Revert "drm/i915: don't touch the VDD when disabling the panel"
  drm: Fix use-after-free in the shadow-attache exit code
  drm/i915: Don't enable display error interrupts from the start
  drm/i915: Fix scanline counter fixup on BDW
  drm/i915: Add a workaround for HSW scanline counter weirdness
  drm/i915: Fix PSR programming