From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Oct 2014 15:31:14 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~176^2~3152
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80ad99da8bd213e12b925407f1c97a303aa8f87f;p=firefly-linux-kernel-4.4.55.git

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

Pull drm fixes from Dave Airlie:
 "Nothing too major or scary.

  One i915 regression fix, nouveau has a tmds regression fix, along with
  a regression fix for the runtime pm code for optimus laptops not
  restoring the display hw correctly"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: make sure display hardware is reinitialised on runtime resume
  drm/nouveau: punt fbcon resume out to a workqueue
  drm/nouveau: fix regression on original nv50 board
  drm/nv50/disp: fix dpms regression on certain boards
  drm/i915: Flush the PTEs after updating them before suspend
---

80ad99da8bd213e12b925407f1c97a303aa8f87f