huashan: enable prima wlan

also cleaned up config with "make savedefconfig"

Change-Id: I236d74e119e6e8ef254d7882e2f74171ee510c66
sound: soc: add sony audio

Change-Id: Ia7b99a4a6e76e0941b2197a492faf279ecd2117c

Conflicts:
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/msm8960.c
misc: pm8xxx-vibrator: add Sony custiomization

Change-Id: I6380cd751fb578bc96a952184503a153f9104a4c

Conflicts:
	drivers/misc/pm8xxx-vibrator.c
Restore Sony camera driver

Change-Id: Id0e9c4ddf7f0aaf819c235f02fb8ad8004af85dc

Conflicts:
	arch/arm/mach-msm/include/mach/camera.h
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/actuators/msm_actuator.h
	drivers/media/video/msm/cci/msm_cam_cci_hwreg.h
	drivers/media/video/msm/cci/msm_cci.c
	drivers/media/video/msm/cci/msm_cci.h
	drivers/media/video/msm/csi/include/csi2.0/msm_csid_hwreg.h
	drivers/media/video/msm/csi/include/csi2.0/msm_csiphy_hwreg.h
	drivers/media/video/msm/csi/include/csi2.0/msm_ispif_hwreg.h
	drivers/media/video/msm/csi/include/csi3.0/msm_csid_hwreg.h
	drivers/media/video/msm/csi/include/csi3.0/msm_csiphy_hwreg.h
	drivers/media/video/msm/csi/include/csi3.0/msm_ispif_hwreg.h
	drivers/media/video/msm/csi/msm_csid.h
	drivers/media/video/msm/csi/msm_csiphy.c
	drivers/media/video/msm/csi/msm_csiphy.h
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/csi/msm_ispif.h
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/gemini/msm_gemini_hw.h
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/gemini/msm_gemini_sync.h
	drivers/media/video/msm/io/msm_camera_i2c.h
	drivers/media/video/msm/io/msm_camera_io_util.c
	drivers/media/video/msm/io/msm_io_8960.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.h
	drivers/media/video/msm/jpeg_10/msm_jpeg_sync.c
	drivers/media/video/msm/mercury/msm_mercury_common.h
	drivers/media/video/msm/mercury/msm_mercury_core.c
	drivers/media/video/msm/mercury/msm_mercury_core.h
	drivers/media/video/msm/mercury/msm_mercury_dev.c
	drivers/media/video/msm/mercury/msm_mercury_hw.c
	drivers/media/video/msm/mercury/msm_mercury_hw.h
	drivers/media/video/msm/mercury/msm_mercury_hw_reg.h
	drivers/media/video/msm/mercury/msm_mercury_macros.h
	drivers/media/video/msm/mercury/msm_mercury_platform.c
	drivers/media/video/msm/mercury/msm_mercury_platform.h
	drivers/media/video/msm/mercury/msm_mercury_sync.c
	drivers/media/video/msm/mercury/msm_mercury_sync.h
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_isp.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/msm_vfe32.h
	drivers/media/video/msm/msm_vpe.c
	drivers/media/video/msm/mt9d112.c
	drivers/media/video/msm/mt9p012.h
	drivers/media/video/msm/mt9p012_km.h
	drivers/media/video/msm/mt9t013.c
	drivers/media/video/msm/mt9t013.h
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/imx091.c
	drivers/media/video/msm/sensors/imx091.h
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/msm_sensor_bayer.c
	drivers/media/video/msm/sensors/msm_sensor_bayer.h
	drivers/media/video/msm/sensors/msm_sensor_common.c
	drivers/media/video/msm/sensors/msm_sensor_common.h
	drivers/media/video/msm/sensors/msm_sensor_init.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/sensors/ov9726_v4l2.c
	drivers/media/video/msm/server/msm_cam_server.h
	drivers/media/video/msm/sn12m0pz.c
	drivers/media/video/msm/vfe/msm_vfe40.c
	drivers/media/video/msm/vfe/msm_vfe40.h
	drivers/media/video/msm/vfe/msm_vfe40_axi.c
	drivers/media/video/msm/vx6953.c
	include/media/msm_gemini.h
	include/media/msm_isp.h
msm:vidc: update from caf/jb_2.5

Change-Id: Iaaf4d7737643a9c8b0d21d1d5829b36a96579fe4
Signed-off-by: ChampionSwimmer <championswimmer@aokp.co>

Conflicts:
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
msm: display: command mode panel release fence

For command mode panel, release fence should be signaled after the buffer is
sent to the panel.  For performance consideration, allow one more commit to be
queued.  Keep the second kick off as short as enough.

Change-Id: I19af075ebf480d3e81b46b1cd2ef21a2893f143e
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
msm: mdp: Change msmfb kworker to kthread

This worker can be a longer running task depending on the number
of frames queued, hence change it to a thread.

Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Change-Id: Iebf7e95d0486ac43aa6a12d70442936600c0249a
msm: mdp: Update sync pt. behaviour

Add a retire fence and clean up the existing release fence
implementation

Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Change-Id: Iecf7e95d0786ac43aa6a12d70442936600c0249a