Merge ranch 'topic-0620/samsung-dmabuf-3.4' into chromeos-exynos-3.4
authorOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 17:31:50 +0000 (10:31 -0700)
committerOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 17:31:50 +0000 (10:31 -0700)
* topic-0620/samsung-dmabuf-3.4:
  UPSTREAM: dma-buf: add initial vmap documentation
  UPSTREAM: dma-buf: minor documentation fixes.
  UPSTREAM: dma-buf: add vmap interface
  UPSTREAM: dma-buf: mmap support


Trivial merge