Merge tag 'dma-buf-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2016 19:32:25 +0000 (12:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2016 19:32:25 +0000 (12:32 -0700)
commitebb8cb2bae0344ef45cc173cdf5402ec91198abd
tree7c21eb9c7a7bf9714035bd243e776e01747206ae
parent6b15d6650c5301ce023d8df0cc3a60b1a76d377e
parentb02da6f8236148009c22167cd7013d5ce04a2d37
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