Merge "ARM: integrate CMA with DMA-mapping subsystem" into msm-3.4