Revert "Rebase intelli_plug"

This reverts commit 07c8ac5543d71108931f3053525244491cb0a9a8.

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