Merge "ARM: dma-mapping: remove redundant code and do the cleanup" into msm-3.4