diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 18:50:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 18:50:27 -0400 |
commit | eabbfdecdae4413687a36fd17c3e98de59ba492b (patch) | |
tree | d8d947b4d0a3a5722221d27b0150571bb1e68aa1 /lib/stmp_device.c | |
parent | 45701e2636a02ab1c5305ead5236f05bda64c15f (diff) | |
parent | 04abab698285297115e5096b3100df1064045529 (diff) | |
download | blackbird-op-linux-eabbfdecdae4413687a36fd17c3e98de59ba492b.tar.gz blackbird-op-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 'lib/stmp_device.c')
0 files changed, 0 insertions, 0 deletions