From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2014 03:39:28 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~176^2~3583
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5556ea4df6426e2a11f459a633e26cb7466e0d1c;p=firefly-linux-kernel-4.4.55.git

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"
---

5556ea4df6426e2a11f459a633e26cb7466e0d1c