From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jun 2016 19:32:25 +0000 (-0700)
Subject: Merge tag 'dma-buf-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits... 
X-Git-Tag: v4.7-rc2~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ebb8cb2bae0344ef45cc173cdf5402ec91198abd;p=linux-2.6-block.git

Merge tag 'dma-buf-for-4.7' of git://git./linux/kernel/git/sumits/dma-buf

Pull dma-buf updates from Sumit Semwal:

 - use of vma_pages instead of explicit computation

 - DocBook and headerdoc updates for dma-buf

* tag 'dma-buf-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
  dma-buf: use vma_pages()
  fence: add missing descriptions for fence
  doc: update/fixup dma-buf related DocBook
  reservation: add headerdoc comments
  dma-buf: headerdoc fixes
---

ebb8cb2bae0344ef45cc173cdf5402ec91198abd