]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2014 17:30:25 +0000 (10:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2014 17:30:25 +0000 (10:30 -0700)
commitdaf543b177835e42a806439346d367dafeb3a1d3
tree66d14e77194681abaa6ae9ec36fa2ea86f547885
parent521bd5e4d9e6eb7e3c76c615d650a2b5ad0f03f5
parent1f58d9465c568eb47cab939bbc4f30ae51863295
Merge tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf

Pull dma-buf fixes from Sumit Semwal:
 "The major changes for 3.17 already went via Greg-KH's tree this time
  as well; this is a small pull request for dma-buf - all documentation
  related"

* tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
  dma-buf/fence: Fix one more kerneldoc warning
  dma-buf/fence: Fix a kerneldoc warning
  Documentation/dma-buf-sharing.txt: update API descriptions