summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-06 00:23:17 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-06 00:23:17 +0400
commitecc728467fb0c3e350b57fc66ed7585c15be50f5 (patch)
tree68d9157193de36f9ac843b2c36222919e66515c4 /fs
parentaa69cb8c1e72b027548f9751e6377a7a7e8bb8fd (diff)
parentf1ae98da8525c6b8b1c301c3a2b0bd2b6515cca2 (diff)
downloadlinux-ecc728467fb0c3e350b57fc66ed7585c15be50f5.tar.xz
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions