| commit | 5b2ba70091c1bef1dfb3677db229dc5392dfec8c | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed May 23 10:46:24 2012 +0100 |
| committer | Dave Airlie <airlied@redhat.com> | Wed May 23 10:46:24 2012 +0100 |
| tree | 903797b4e09b9444450fb35b4101c1fd9b8530b0 | |
| parent | 4d93914ae3db4a897ead4b1e33eca7cdfff4c6f7 [diff] | |
| parent | 40f5cf996991577ec65d36cd3599cca7ec5d87d3 [diff] |
Merge branch 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux into drm-core-next * 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux: drm/radeon: add PRIME support (v2) i915: add dmabuf/prime buffer sharing support. nouveau: add PRIME support ttm: add prime sharing support to TTM (v2) udl: add prime fd->handle support. drm/prime: add exported buffers to current fprivs imported buffer list (v2) drm/prime: introduce sg->pages/addr arrays helper