From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Aug 2013 23:17:10 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v4.14-rc1~9109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=418a95bc0e26c27b693eb6276f92012f45ed568f;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull drm fixes from Dave Airlie:
 "Since we are getting to the pointy end, one i915 black screen on some
  machines, and one vmwgfx stop userspace ability to nuke the VM,

  There might be one or two ati or nouveau fixes trickle in before
  final, but I think this should pretty much be it"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Split GMR2_REMAP commands if they are to large
  drm/i915: ivb: fix edp voltage swing reg val
---

418a95bc0e26c27b693eb6276f92012f45ed568f