diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-04 20:59:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-04 20:59:51 +0300 |
| commit | 6587457b4b3d663b237a0f95ddf6e67d1828c8ea (patch) | |
| tree | 401b57623047ebcd1e30d926d50667ce49521f1e /drivers/char/virtio_console.c | |
| parent | b8e81a3b68c57b2ea7b661424f2ab8cf06f15e42 (diff) | |
| parent | 4eb2440ed60fb5793f7aa6da89b3d517cc59de43 (diff) | |
| download | linux-6587457b4b3d663b237a0f95ddf6e67d1828c8ea.tar.xz | |
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 'drivers/char/virtio_console.c')
0 files changed, 0 insertions, 0 deletions