tree 8bdbf8407c8cd917f24a0d5a5c6a865db6366f3c
parent 40c43269cf8e88a0bdc306c717d1dd5446a6f3b8
parent b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7
author Linus Torvalds <torvalds@linux-foundation.org> 1412974568 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1412974568 -0400

Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull dma-mapping update from Marek Szyprowski:
 "Provide the dma write coherent api (available previously on ARM
  architecture) for all other architectures, which use dma_ops-based dma
  mapping implementation.

  This lets one to use the same code in the device drivers regardless of
  the selected architecture"

* 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  dma-mapping: Provide write-combine allocations
  s390: Implement dma_{alloc,free}_attrs()