Merge tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2015 17:05:39 +0000 (10:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2015 17:05:39 +0000 (10:05 -0700)
commitb3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56
tree7239d8ee8302e3bb7ff74d9bc6195ab6bb52295c
parentd6a4c0e5d3d433ef296f8f417e835329a834a256
parent72449cb47b0104c32ff8fb9380ade9113375d8d1
Merge tag 'dma-buf-for-4.1' of git://git./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