Merge branch 'for-v4.1-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2015 22:50:27 +0000 (18:50 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2015 22:50:27 +0000 (18:50 -0400)
commiteabbfdecdae4413687a36fd17c3e98de59ba492b
treed8d947b4d0a3a5722221d27b0150571bb1e68aa1
parent45701e2636a02ab1c5305ead5236f05bda64c15f
parent04abab698285297115e5096b3100df1064045529
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