diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-07 12:21:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-07 12:21:42 +1000 |
| commit | 1e95ab5846504b2c0e9a01405bbb3278e2e20480 (patch) | |
| tree | b8af3af9373dd0bbcb7df30b5e5a7b66dbf98801 /drivers/clocksource/dw_apb_timer_of.c | |
| parent | 4695b03970df378dcb93fe3e7158381f1e980fa2 (diff) | |
| parent | d92d985177c495aab53c7167f310a7efb1853918 (diff) | |
Merge branch 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next
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
Diffstat (limited to 'drivers/clocksource/dw_apb_timer_of.c')
0 files changed, 0 insertions, 0 deletions