From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Mar 2015 17:59:51 +0000 (-0800)
Subject: Merge tag 'dma-buf-for-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.0-rc3~20
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=6587457b4b3d663b237a0f95ddf6e67d1828c8ea

Merge tag 'dma-buf-for-4.0-rc3' of git://git./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)
---

6587457b4b3d663b237a0f95ddf6e67d1828c8ea