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
valentewx: fix mismerge
input: touchscreen: synaptics_3200: Allow disabling keypad

Change-Id: I0882249f2ea84777db31bf9b887f8874b8c25d73
gpu: msm2: Sync to upstream

* Sync with changes done in Google MSM kernel

Change-Id: I38b3d4b41a986dc16097b838afc770e372ddfc7d
m7_defconfig: disable USE_STATIC_BUF

This reduces WiFi audio stuttering issues that some may be experiencing

Change-Id: I41809c51b32167ae197001c07e4b519fd4bbdd8a