Merge "msm: camera: isp: Handle array out of bounds"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 1 Mar 2017 10:22:43 +0000 (02:22 -0800)

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

Wed, 1 Mar 2017 10:22:42 +0000 (02:22 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 1 Mar 2017 10:22:43 +0000 (02:22 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 1 Mar 2017 10:22:42 +0000 (02:22 -0800)
diff --cc drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 1 Mar 2017 10:22:43 +0000 (02:22 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 1 Mar 2017 10:22:42 +0000 (02:22 -0800)