]> 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)
commit3d75fa2d1c7dd7c5db68c2cf8b17a43c3528637e
tree401b57623047ebcd1e30d926d50667ce49521f1e
parent99548f7a30f4943496db8b54e920eb2467df5b00
parent4775ea7c1afca668530a9ccab19d297ccd85707f
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)