Merge "arm: Add support for CONFIG_ENABLE_DMM" into msm-3.0