Merge tag 'for-3.12' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 02:09:14 +0000 (19:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 02:09:14 +0000 (19:09 -0700)
commitb3b7568490bb66688ee64f4ab72ec697f4f983c5
treee55098d4c05d2169e1934dcdf816e476c2af86f8
parentc2d95729e3094ecdd8c54e856bbe971adbbd7f48
parent19e8697ba45e7bcdb04f2adf6110fbf4882863e5
Merge tag 'for-3.12' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

Pull dma-buf updates from Sumit Semwal:
 "Yet another small one - dma-buf framework now supports size discovery
  of the buffer via llseek"

* tag 'for-3.12' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
  dma-buf: Expose buffer size to userspace (v2)
  dma-buf: Check return value of anon_inode_getfile