Merge "ais: set list cmd to be available after del before return"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 22 Mar 2018 19:23:11 +0000 (12:23 -0700)

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

Thu, 22 Mar 2018 19:23:11 +0000 (12:23 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 22 Mar 2018 19:23:11 +0000 (12:23 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 22 Mar 2018 19:23:11 +0000 (12:23 -0700)
diff --cc drivers/media/platform/msm/ais/isp/msm_isp_util.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 22 Mar 2018 19:23:11 +0000 (12:23 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 22 Mar 2018 19:23:11 +0000 (12:23 -0700)