Merge "scsi: ufs: Unblock UFS while ICE HW configuration"

author Linux Build Service Account <lnxbuild@quicinc.com>

Thu, 29 Jun 2017 18:34:46 +0000 (11:34 -0700)

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

Thu, 29 Jun 2017 18:34:46 +0000 (11:34 -0700)
author Linux Build Service Account <lnxbuild@quicinc.com>
Thu, 29 Jun 2017 18:34:46 +0000 (11:34 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 29 Jun 2017 18:34:46 +0000 (11:34 -0700)
diff --cc drivers/crypto/msm/ice.c
Simple merge
diff --cc drivers/scsi/ufs/ufs-qcom-ice.c
Simple merge
author	Linux Build Service Account <lnxbuild@quicinc.com>
	Thu, 29 Jun 2017 18:34:46 +0000 (11:34 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 29 Jun 2017 18:34:46 +0000 (11:34 -0700)
		1	2
drivers/crypto/msm/ice.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufs-qcom-ice.c	patch \|	diff1 \|	diff2 \|	blob \| history