UPSTREAM commit 'aec88a64' 11/30

* commit 'aec88a64':
  msm: camera: sensor: Modify log type
  msm: camera: Allow flush to happen when camera sensor is streaming
  msm: camera: isp: Avoid applying while processing bubble recovery
  msm: camera: camif: Select epoch config to half of frame
  msm: camera: csid: Halt csid if error irqs exceed threshold
  msm: camera: camif: Select epoch config to half of frame
  ARM: dts: msm: Enable cx-ipeak support for camera
  ARM: dts: msm: Enable ICP PC feature for sdmmagpie
  msm: camera: Add support to camera cx ipeak
  msm: camera: isp: Change voting logic to support new ports in sdmmagpie
  msm: camera: Increase the max supported cameras to 5
  ARM: dts: msm: Add new sensor node for imx318
  msm: camera: cpas: Updated QoS settings
  msm: camera: isp: Cleanup if IFE hardware device init fails

Change-Id: I20145fad2462751d7275d5887118e90c6049e3ed
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>