From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Oct 2014 20:56:08 +0000 (-0400)
Subject: Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
X-Git-Tag: firefly_0821_release~176^2~3093
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=754c780953397dd5ee5191b7b3ca67e09088ce7a;p=firefly-linux-kernel-4.4.55.git

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()
---

754c780953397dd5ee5191b7b3ca67e09088ce7a