IPC Router/Socket: Fix GPS/Thermald crash.
Updated to caf jb_2.5

Conflicts:
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/htc/elite/board-elite-audio.c
	arch/arm/mach-msm/htc/elite/board-elite.c
	arch/arm/mach-msm/htc/jet/board-jet-audio.c
	arch/arm/mach-msm/htc/jet/board-jet.c
	arch/arm/mach-msm/htc/ville/board-ville-audio.c
	arch/arm/mach-msm/htc/ville/board-ville.c
	arch/arm/mach-msm/subsystem_restart.c
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
	drivers/input/touchscreen/Makefile
Add some charger things for mako (out of context)

Conflicts:
	include/linux/power_supply.h
booting mako (good to test)
add flag for module compile
update prima to 3.2.3.108