tree b2ed77452d8375d53a57012c0ff16affb7aef717
parent d20d3174806ef6589cb912a488657d21fcd7ece2
parent 71d7282a0f1abb488e5be4d154893579624bc683
author Dave Airlie <airlied@redhat.com> 1370902461 +1000
committer Dave Airlie <airlied@redhat.com> 1370902461 +1000

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