]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 7 Nov 2013 02:21:42 +0000 (12:21 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 7 Nov 2013 02:21:42 +0000 (12:21 +1000)
Pull request for vmwgfx. Currently just the DMA address stuff.

* 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Use the linux DMA api to get valid device addresses of pages
  drm/ttm: Enable the dma page pool also for intel IOMMUs


Trivial merge