From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2015 17:05:39 +0000 (-0700)
Subject: Merge tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits... 
X-Git-Tag: v4.1-rc1~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56;p=karo-tx-linux.git

Merge tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf

Pull dma-buf updates from Sumit Semwal:
 "Minor cleanup only; this could've gone in for the 4.0 merge window,
  but for a copy-paste stupidity from me.

  It has been in the for-next since then, and no issues reported.

   - cleanup of dma_buf_export()

   - correction of copy-paste stupidity while doing the cleanup"

* tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
  staging: android: ion: fix wrong init of dma_buf_export_info
  dma-buf: cleanup dma_buf_export() to make it easily extensible
---

b3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56