Merge "ARM: dma-mapping: use pr_* instread of printk" into msm-3.4