From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Nov 2014 20:37:45 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.18-rc5~38
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b3cf93b3560afb024b552c573253d7b8225ffcc8;p=linux.git

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

Pull drm fixes from Dave Airlie:
 "Radeon and i915 fixes.

  I probably should have sent these earlier, but nothing too urgent in
  them:

   - i915:
        blackscreen and corruption fixes
   - radeon:
        oops, locking and stability"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: add missing crtc unlock when setting up the MC
  drm/radeon: use gart for DMA IB tests
  drm/radeon: make sure mode init is complete in bandwidth_update
  drm/radeon: set correct CE ram size for CIK
  drm/i915: safeguard against too high minimum brightness
  drm/i915: vlv: fix gunit HW state corruption during S4 suspend
  drm/i915: Disable caches for Global GTT.
---

b3cf93b3560afb024b552c573253d7b8225ffcc8