From: Dave Airlie Date: Mon, 10 Jun 2013 22:14:21 +0000 (+1000) Subject: Merge branch 'drm/next' of git://linuxtv.org/pinchartl/fbdev into drm-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=edee06b6f6b55c81c4cb78d0776d8ca01b05380d;p=linux-beck.git Merge branch 'drm/next' of git://linuxtv.org/pinchartl/fbdev into drm-next GEM CMA PRIME support from Laurent. * 'drm/next' of git://linuxtv.org/pinchartl/fbdev: drm: GEM CMA: Add DRM PRIME support drm: GEM CMA: Split object mapping into GEM mapping and CMA mapping drm: GEM CMA: Split object creation into object alloc and DMA memory alloc drm/omap: Use drm_gem_mmap_obj() to implement dma-buf mmap drm/gem: Split drm_gem_mmap() into object search and object mapping --- edee06b6f6b55c81c4cb78d0776d8ca01b05380d