]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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


Trivial merge