Merge tag 'dma-buf-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Feb 2014 20:42:45 +0000 (12:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Feb 2014 20:42:45 +0000 (12:42 -0800)
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


Trivial merge