serrano: Merge with MG3

Conflicts:
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/board-serrano.c
	drivers/input/touchscreen/mxts.c
	drivers/input/touchscreen/mxts_sec.c
	include/linux/i2c/mxts.h