tree a8ecc76c7d4247beba150e630fc89ae7cae33c18
parent cfad81ce28b6d47fbc7c8afabd3ab16d9a8499e9
parent e898c791e1a4c27fa1f221058b29b0ad06ddf8b0
author Linus Torvalds <torvalds@linux-foundation.org> 1405913968 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1405913968 -0700

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

Pull intel drm fixes from Dave Airlie:
 "Intel fixes came in late, but since I debugged one of them I'll send
  them on,

  Two reverts, a quirk and one warn regression"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
  drm/i915: Track the primary plane correctly when reassigning planes
  drm/i915: Ignore VBT backlight presence check on HP Chromebook 14
  Revert "drm/i915: Don't set the 8to6 dither flag when not scaling"