diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 16:37:26 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 16:37:26 (GMT) |
| commit | da89fb165e5e51a2ec1ff8a0ff6bc052d1068184 (patch) | |
| tree | 1f15b6177a886ceef83d60c3b5a7af926442f581 /fs/nfsd/acl.h | |
| parent | d5adf235adc8d8d67c10afd43922c92753f6be3c (diff) | |
| parent | b25b086d23eb852bf3cfdeb60409b4967ebb3c0c (diff) | |
| download | linux-da89fb165e5e51a2ec1ff8a0ff6bc052d1068184.tar.xz | |
Merge tag 'tag-for-linus-3.5' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
Pull dma-buf updates from Sumit Semwal:
"Here's the first signed-tag pull request for dma-buf framework. It
includes the following key items:
- mmap support
- vmap support
- related documentation updates
These are needed by various drivers to allow mmap/vmap of dma-buf
shared buffers. Dave Airlie has some prime patches dependent on the
vmap pull as well."
* tag 'tag-for-linus-3.5' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
dma-buf: add initial vmap documentation
dma-buf: minor documentation fixes.
dma-buf: add vmap interface
dma-buf: mmap support
Diffstat (limited to 'fs/nfsd/acl.h')
0 files changed, 0 insertions, 0 deletions