From: Daniel Vetter Date: Fri, 1 Jun 2012 08:49:16 +0000 (+0200) Subject: Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~12780^2~47^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e269f90f3d3f7c70cf661c660bf445597261f54a;p=mirror_ubuntu-zesty-kernel.git Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued We need the latest dma-buf code from Dave Airlie so that we can pimp the backing storage handling code in drm/i915 with Chris Wilson's unbound tracking and stolen mem backed gem object code. Signed-Off-by: Daniel Vetter --- e269f90f3d3f7c70cf661c660bf445597261f54a