diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 15:02:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 15:02:41 -0700 |
commit | ed0bb8ea059764c3fc882fb135473afd347335e9 (patch) | |
tree | 5274b8335afe85f76d1eb945eb03ffe4040737b4 /drivers/tty/serial | |
parent | 47b816ff7d520509176154748713e7d66b3ad6ac (diff) | |
parent | 3e0b2a1993c06e646d90d71e163d03869a211a4c (diff) | |
download | linux-ed0bb8ea059764c3fc882fb135473afd347335e9.tar.bz2 |
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
Pull dma-buf updates from Sumit Semwal:
"This includes the following key items:
- kernel cpu access support,
- flag-passing to dma_buf_fd,
- relevant Documentation updates, and
- some minor cleanups and fixes.
These changes are needed for the drm prime/dma-buf interface code that
Dave Airlie plans to submit in this merge window."
* 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
dma-buf: correct dummy function declarations.
dma-buf: document fd flags and O_CLOEXEC requirement
dma_buf: Add documentation for the new cpu access support
dma-buf: add support for kernel cpu access
dma-buf: don't hold the mutex around map/unmap calls
dma-buf: add get_dma_buf()
dma-buf: pass flags into dma_buf_fd.
dma-buf: add dma_data_direction to unmap dma_buf_op
dma-buf: Move code out of mutex-protected section in dma_buf_attach()
dma-buf: Return error instead of using a goto statement when possible
dma-buf: Remove unneeded sanity checks
dma-buf: Constify ops argument to dma_buf_export()
Diffstat (limited to 'drivers/tty/serial')
0 files changed, 0 insertions, 0 deletions