add
delete
 Merge https://github.com/bsmitty83/B-Team_AOSP

Conflicts:
	.config
	.config.old
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/msm_axi_qos.c
	drivers/media/video/msm/msm_camera-7x30.c
	drivers/media/video/msm/msm_io_7x30.c
	drivers/media/video/msm/msm_vfe_7x30.c
	drivers/media/video/msm/msm_vfe_7x30.h
	drivers/media/video/msm/msm_vpe1_7x30.c
	drivers/media/video/msm/msm_vpe1_7x30.h
	drivers/media/video/msm/mt9p012_km.c
	drivers/media/video/msm/mt9p012_km.h
	drivers/media/video/msm/mt9p012_km_reg.c
	drivers/media/video/msm/rawchip/Makefile
	drivers/media/video/msm/s5k3h1gx.c
	drivers/media/video/msm/s5k3h1gx.h
	drivers/media/video/msm/s5k3h1gx_reg.c
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/s5k6aafx.c
	drivers/media/video/msm/sensors/s5k6aafx.h
	drivers/media/video/msm/sensors/s5k6aafx_reg_vivo.c
	drivers/media/video/msm/sn12m0pz.c
	drivers/media/video/msm/sn12m0pz.h
	drivers/media/video/msm/sn12m0pz_reg.c
	drivers/media/video/msm/vx6953.c
	drivers/media/video/msm/vx6953.h
	drivers/media/video/msm/vx6953_reg.c
	include/config/auto.conf
	include/config/tristate.conf
	include/generated/autoconf.h
	include/media/msm_camera_sensor.h