From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jun 2012 20:23:17 +0000 (-0700)
Subject: Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ecc728467fb0c3e350b57fc66ed7585c15be50f5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Pull arm CMA fix from Marek Szyprowski:
 "This removes the ARMv6+ CMA dependency and lets one use old, well-
  tested dma-mapping implementation also on ARMv6+ systems without the
  need to use EXPERIMENTAL stuff."

Russell King complained (rightly) about the experimental feature being
forced on by the ARM config.

Here CMA is "continuous memory allocator", not "cross-memory attach".
We really neet to stop using insane TLA's for things that aren't big
industry standards.

* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: remove unconditional dependency on CMA
---

ecc728467fb0c3e350b57fc66ed7585c15be50f5