From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Dec 2012 15:18:29 +0000 (-0800)
Subject: Merge tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~17528
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ddedec28b1d5144bc2c765d97003997f3505fd3a;p=mirror_ubuntu-focal-kernel.git

Merge tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

Pull dma-buf updates from Sumit Semwal:
 "A fairly small dma-buf pull request for 3.8 - only 2 patches"

* tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
  dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER
  dma-buf: might_sleep() in dma_buf_unmap_attachment()
---

ddedec28b1d5144bc2c765d97003997f3505fd3a