Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@redhat.com>
Mon, 2 Nov 2015 22:02:44 +0000 (08:02 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 2 Nov 2015 22:02:44 +0000 (08:02 +1000)
commitc0f3f90cf454dd845dcc443afa4f0e312a8eaee0
treeaa98933f03015d9841574bd386f3f650eb407adf
parenta76edb8cec0cc864c8b72fa7e84a72336e033e23
parentb76ff5ea1cf6fe648e7ce2b84e636f8a95849a0b
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next

Changes for vmwgfx for 4.4. If there is time, I'll follow up with a series
to move to threaded irqs.

* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Replace iowrite/ioread with volatile memory accesses
  drm/vmwgfx: Turn off support for multisample count != 0 v2
  drm/vmwgfx: switch from ioremap_cache to memremap