Intelli_plug 2.0 @faux123

Conflicts:

	arch/arm/mach-msm/Kconfig