valentewx: merge camera

Conflicts:

	arch/arm/configs/valente_wx_defconfig
valentewx: merge 1seg

Conflicts:

	arch/arm/mach-msm/htc/valente_wx/board-valente_wx-gpiomux.c
	arch/arm/mach-msm/htc/valente_wx/board-valente_wx.c