ARM: dma-mapping: fix executability of CMA mappings merge

Change-Id: I2d548dd0e54e589283881b460b708cf8038bc88d
Merge branch 'cm-11.0' of git://github.com/cyanogenmod/android_kernel_sony_msm8974 into caf

Conflicts:
	arch/arm/mm/dma-mapping.c