commit e3ed1a344e128b179b81da731229a8a83f4d736d
author Raja Mallik <rmallik@codeaurora.org> Thu Aug 22 17:12:32 2019 +0530
committer Raja Mallik <rmallik@codeaurora.org> Tue Aug 27 14:08:13 2019 +0530
tree 6999ffc5163836c040e7c2d50eac4552fe696a6c
parent 1e353927e656bbf190e69c4ac5302d1d9d7da7f6

Merge remote-tracking branch 'dev/msm-4.14' into msm-4.9 08/19

* commit '65130d2ad231cd3fd65e076e45b4593b9555f5b1':

  msm: camera: cam_isp: Change default fps value
  ARM: dts: msm: Add dtsi string support for bindings
  msm: camera: isp: Added PPI driver functionality
  msm: camera: isp: Log information during IFE acquire failure
  msm: camera: cam_isp: Recovery after IRQ delayed
  msm: camera: isp: Add fps Blob support
  msm: camera: isp: Enable pixel_format_measurement in CSID
  msm: camera: isp: Handle wait and active list during flush all
  msm: camera: isp: Add irq status prints to CAM_ERR

Change-Id: I43ce3f6daaa91302e8b1db030b7953372b463606
Signed-off-by: Raja Mallik <rmallik@codeaurora.org>