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

Change-Id: I2d548dd0e54e589283881b460b708cf8038bc88d
Merge pull request #13 from CyanogenMod/cm-11.0

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