]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge