From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Feb 2014 20:42:45 +0000 (-0800)
Subject: Merge tag 'dma-buf-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits... 
X-Git-Tag: firefly_0821_release~176^2~4402
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=60f76eab19e3903e810bdc3ec846c158efcd2e21;p=firefly-linux-kernel-4.4.55.git

Merge tag 'dma-buf-for-3.14' of git://git./linux/kernel/git/sumits/dma-buf

Pull dma-buf fix from Sumit Semwal:
 "Just some debugfs output updates.

  There's another patch related to dma-buf, but it'll get upstreamed via
  Greg KH's pull request"

* tag 'dma-buf-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
  dma-buf: update debugfs output
---

60f76eab19e3903e810bdc3ec846c158efcd2e21