Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux
authorDave Airlie <airlied@gmail.com>
Sat, 5 Jul 2014 21:49:28 +0000 (07:49 +1000)
committerDave Airlie <airlied@gmail.com>
Sat, 5 Jul 2014 21:49:28 +0000 (07:49 +1000)
fix to a 3.15 commit.

* 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix incorrect write to read-only register v2:


Trivial merge