From: Stephen Boyd <sboyd@kernel.org>
Date: Mon, 4 Jun 2018 19:35:59 +0000 (-0700)
Subject: Merge branch 'clk-qcom-8996-halt' into clk-next
X-Git-Tag: for-linus-20180616~21^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a74271a50782cd93a155144b6e8fb2a18175216c;p=linux-2.6-block.git

Merge branch 'clk-qcom-8996-halt' into clk-next

* clk-qcom-8996-halt:
  clk: qcom: gcc-msm8996: Disable halt check on UFS clocks
  clk: msm8996-gcc: Mark halt check as no-op for USB/PCIE pipe_clk
---

a74271a50782cd93a155144b6e8fb2a18175216c