Revert "Squash intelli_plug v3.8"

This reverts commit a2c2ee566bb0d938c72e70a4f6c1df11c75c590b.

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/intelli_plug.c