From: Linus Torvalds Date: Thu, 16 Apr 2015 22:50:27 +0000 (-0400) Subject: Merge branch 'for-v4.1-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma... X-Git-Tag: v5.15~15959 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eabbfdecdae4413687a36fd17c3e98de59ba492b;p=platform%2Fkernel%2Flinux-starfive.git 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 --- eabbfdecdae4413687a36fd17c3e98de59ba492b