]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'dma-buf-for-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2015 17:59:51 +0000 (09:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2015 17:59:51 +0000 (09:59 -0800)
commit68a50de5887b1215f56ff4a7f259330d9206b2da
tree401b57623047ebcd1e30d926d50667ce49521f1e
parentd1591dc3842d86848fc60a6fa7fd4a654c5637c5
parent76deeb869cdf36615b788d41a613697e57141176
Merge tag 'dma-buf-for-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf

Pull dma-buf fixes from Sumit Semwal:
 "Minor timeout & other fixes on reservation/fence"

* tag 'dma-buf-for-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
  reservation: Remove shadowing local variable 'ret'
  dma-buf/fence: don't wait when specified timeout is zero
  reservation: wait only with non-zero timeout specified (v3)