tree 137e6a66354a25b752390f5f11fff275c7bba788
parent c065ad0f9e33eba0af1c8cdc00a32a33a74d560b
parent e50fd27b416768fd6b1edbbad2b7667abbee6f7d
author Linux Build Service Account <lnxbuild@localhost> 1344001797 -0700
committer QuIC Gerrit Code Review <code-review@localhost> 1344001797 -0700

Merge changes Ieb3cdcc2,Id36b52ae,I274c17de,I5d0b7436,I90c0178d into msm-3.4

* changes:
  camera: Pass the isp notification to correct mctl/config.
  camera: vfe32: Add RDI reg update ack notification.
  vfe32: Separate AXI reset with VFE reset.
  msm: camera: Add api for axi halt and axi stop
  msm: camera: calculate sof_count in ISPIF instead of VFE