Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@gmail.com>
Sat, 7 Nov 2015 07:16:29 +0000 (17:16 +1000)
committerDave Airlie <airlied@gmail.com>
Sat, 7 Nov 2015 07:16:29 +0000 (17:16 +1000)
One is fix for a regression in 4.3, One irq locking rework.

* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Relax irq locking somewhat
  drm/vmwgfx: Properly flush cursor updates and page-flips


Trivial merge