Merge "ARM: dma-mapping: use alloc, mmap, free from dma_ops" into msm-3.4