| commit | 8129c7e5aa49ea5cb2189c9c570def088f4bfba7 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri Aug 03 06:49:57 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Fri Aug 03 06:49:57 2012 -0700 |
| tree | 137e6a66354a25b752390f5f11fff275c7bba788 | |
| parent | c065ad0f9e33eba0af1c8cdc00a32a33a74d560b [diff] | |
| parent | e50fd27b416768fd6b1edbbad2b7667abbee6f7d [diff] |
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