summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-04 09:59:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-04 09:59:51 -0800
commit6587457b4b3d663b237a0f95ddf6e67d1828c8ea (patch)
tree401b57623047ebcd1e30d926d50667ce49521f1e /fs
parentb8e81a3b68c57b2ea7b661424f2ab8cf06f15e42 (diff)
parent4eb2440ed60fb5793f7aa6da89b3d517cc59de43 (diff)
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)
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions