Merge from THLG
	modified:   arch/arm/mach-msm/lge/m4/board-msm7x27a_m4.c
	modified:   arch/arm/mach-msm/lge/u0/board-msm7x27a_u0.c
	modified:   include/media/msm_gemini.h