Add PN65N NFC driver and TSL2772 Proximity Sensor drivers

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	drivers/misc/Makefile
Add fixes to vibrator from sony

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
Add missing header and fixes to LEDs

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
Add Samsung and Chimei display panel drivers

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	drivers/video/msm/mipi_dsi.c
Integrate display panels in the kernel and add some mdp fixes from Sony

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
Add Sony logo changes and framebuffer fix for custom recoveries

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	drivers/video/msm/logo.c
Rebase charger drivers to stock sony and modifications to USB

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	arch/arm/mach-msm/board-8930-camera.c
	drivers/power/pm8xxx-ccadc.c
	drivers/usb/gadget/f_mtp.c
	include/linux/mfd/pm8xxx/batterydata-lib.h
Decouple CCI drivers from board

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
IMX134 sensor method integration into msm_camera

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	include/media/msm_camera.h
Some SCSI additions from Sony

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
Some missing members in platform data

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
Decouple CCI from SMD module

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>
We do not use VT

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	drivers/media/video/msm/msm_mctl.c
Fix a compilation error as module header was absent

Signed-off-by: varunchitre15 <varun.chitre15@gmail.com>

Conflicts:
	drivers/media/video/msm/msm_v4l2_video.c
Enable Prima

Conflicts:
	arch/arm/configs/cm_taoshan_defconfig
Some fixes to vidc