tree 147a96194138b5ecb789b55e18824313b7026dfc
parent f5d98565772a545f148026d473e155579a589762
parent a1c84337ae4e6806270f7dd74713a4a246d75c79
author Abhijit Trivedi <abhijitt@codeaurora.org> 1506059651 -0700
committer Abhijit Trivedi <abhijitt@codeaurora.org> 1506060016 -0700

UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9 - 092117

* quic/dev/msm-4.9-camx:
If0f9fc4a0da3d4184571d9d1db5f03ef26eb3191  Revert "msm: camera: Add support for combo mode"
Ia36a8b1d27d3c4ab42376c94dd6e2117bb414f87  msm: camera: sensor: Correct check condition
I96781d0a59404edcb0bf44609682f0344efa788d  msm: camera: sanitize the camera sensor driver
I2517a00dd00dbe0a22225699adde63949d53bb28  msm: camera: fd: Update HALT-RESET sequence
I162feb46c7aa570b68115dacd3cf040afa5b11d0  msm: camera: isp: Add support to raw dump
If500ab04c0174b36f2bb7576b7fa86efa33bbb3d  msm: camera: Add v4l2 file ops for cci subdevice
I3e61f171592dfd130717c5f338fc1e1503bb2f2e  msm: camera: fd: Map buffers to device, cpu only if required
I79cbefefe5fd9a9d1c895a7a68fe18895ff8c23b  msm: camera: jpeg: stability fixes
I46de41c262811309240db8f47f719026fb6c2043  msm: camera: Add support for combo mode
Ief431093357e925c1ae2dd65d096a82f206340b9  msm: camera: flash: add support to nop packets for flash module
I5562bd6a2de201198dd0877751e7439f80cf3f0d  msm: camera: icp: Increase supported contexts
I8e99b0c5ac1a7e2cdd713914f2c7dd0797e45b0d  msm: camera: fd: move start cmd to post config
I3d7b2e13c9720d5c01bd9da74ac150e0ab375f11  msm: camera: fd: add FD trace point
I3312a0248afe77a63ef483f8a0f6afc34a88cd7a  ARM: dts: msm: Enable OIS device on SDM845
I1fd598b9d363d6f8d9c3f0f46193c3b041eec2cd  msm: camera: isp: update CSID AXI bandwidth vote to default value

Change-Id: I84fc45caebd1da0aa64f7ebee7bad176d7150108
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>