includes from 2.5.5

Conflicts:
	include/linux/msm_ion.h