From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jun 2011 05:01:40 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith... 
X-Git-Tag: firefly_0821_release~3680^2~5188
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=536142f950f7ea4f3d146a138ad6938f28a34f33;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/keithp/linux-2.6

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: save/resume forcewake lock fixes
  Revert "drm/i915: Kill GTT mappings when moving from GTT domain"
  drm/i915: Apply HWSTAM workaround for BSD ring on SandyBridge
  drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again)
---

536142f950f7ea4f3d146a138ad6938f28a34f33