Merge "msm: camera: ispif: adds 3D support"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 14 Apr 2017 14:29:02 +0000 (07:29 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Fri, 14 Apr 2017 14:29:01 +0000 (07:29 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 14 Apr 2017 14:29:02 +0000 (07:29 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 14 Apr 2017 14:29:01 +0000 (07:29 -0700)
diff --cc drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 14 Apr 2017 14:29:02 +0000 (07:29 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 14 Apr 2017 14:29:01 +0000 (07:29 -0700)