Revert "Squashed Revert of ION changes"

This reverts commit fc54a89648ae737f1590dd6ab272eb76f808e178.

Conflicts:
	Documentation/devicetree/bindings/fb/mdss-mdp.txt
Revert "Revert "ion: Squashed commit of upstream updates""

This reverts commit c7d10ee0a926812efbb6896deda3566c0cf053e9.
ARM: dma-mapping: fix executability of CMA mappings merge

Change-Id: I2d548dd0e54e589283881b460b708cf8038bc88d