M2_SPR: drivers/hwmon: properly ifdef our changes
M2_SPR: devices-8960: benign ifdef our changes
M2_SPR: low level debugging
M2_SPR: remove CMA/MSM_IOMMU/GPU_SYNC(dirty); bring back original reserve_ion

Conflicts:

	arch/arm/mach-msm/Kconfig