tree 2cc51c13c96058301889657c803b147d9092b61f
parent 901d889adb6520ab1a19ec2e90ce743642d11504
parent cf97354efb9ce1464105ecdbb72615c60cf834ec
author Sridhar Gujje <sgujje@codeaurora.org> 1519204932 +0530
committer Sridhar Gujje <sgujje@codeaurora.org> 1519205067 +0530

Merge commit 'cf97354efb9ce1464105ecdbb72615c60cf834ec' into msm-4.9_UPSTREAM_0321_PC105

* commit 'cf97354efb9ce1464105ecdbb72615c60cf834ec':
  msm: camera: sync: Fix merge sync object issue
  msm: camera: req_mgr: Handle inject delay for sync links
  ARM: dts: msm: Add new memory region in icp ctx for SDM 845/670
  msm: camera: crm: Mutliple fixes in request manager
  Revert "msm: camera: reqmgr: Adds total ordering of reqs for all pd devices"
  msm: camera: isp: Fix CAMIF PDAF Config
  ARM: dts: msm: Add OPP table entries for CAM CC clocks on sdm670
  msm: camera: core: Remove the null check before sending flush
  msm: camera: crm: increasing mutex lock window
  msm: camera: icp: Freeing memory in workqueue
  msm: camera: isp: Reduce the spinlock window
  msm: camera: isp: Change warning log to error rate limited log
  msm: camera: core: Req list handling enhancement

Change-Id: I7fe1f19165124b31eb65b9c7a7b1e8abbcc456c9
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>