ION: CAF
Merge branch 'master' of https://github.com/Team-SennyC2/senny_kernel-3.4

Conflicts:
	arch/arm/configs/senny_defconfig