| commit | eabbfdecdae4413687a36fd17c3e98de59ba492b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 16 18:50:27 2015 -0400 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 16 18:50:27 2015 -0400 |
| tree | d8d947b4d0a3a5722221d27b0150571bb1e68aa1 | |
| parent | 45701e2636a02ab1c5305ead5236f05bda64c15f [diff] | |
| parent | 04abab698285297115e5096b3100df1064045529 [diff] |
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