diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 00:50:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 00:50:27 +0200 |
commit | eabbfdecdae4413687a36fd17c3e98de59ba492b (patch) | |
tree | d8d947b4d0a3a5722221d27b0150571bb1e68aa1 /drivers | |
parent | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff) | |
parent | include/dma-mapping: Clarify output of dma_map_sg (diff) | |
download | linux-eabbfdecdae4413687a36fd17c3e98de59ba492b.tar.xz linux-eabbfdecdae4413687a36fd17c3e98de59ba492b.zip |
Merge branch 'for-v4.1-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping updates from Marek Szyprowski:
"This contains two patches, which clarify abiguity in the dma-mapping
api"
* 'for-v4.1-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
include/dma-mapping: Clarify output of dma_map_sg
asm/dma-mapping-common: Clarify output of dma_map_sg_attrs
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions