Merge branch android-msm-shamu-3.10-nyc-security-next into android-msm-shamu-3.10-nyc

drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c

drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c

...dia/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

...s/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

...s/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

...dia/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c

...dia/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

...s/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

...ers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c

drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c