Merge branch 'clk-qcom-8996-halt' into clk-next
authorStephen Boyd <sboyd@kernel.org>
Mon, 4 Jun 2018 19:35:59 +0000 (12:35 -0700)
committerStephen Boyd <sboyd@kernel.org>
Mon, 4 Jun 2018 19:35:59 +0000 (12:35 -0700)
commita74271a50782cd93a155144b6e8fb2a18175216c
treec5a01756b42d3cd2b5ccc7b4345dd322118e5e04
parent77122d6f7477899ba6d1b2d340956bd6fd9ee3b5
parent12d807cd34b8620a531f7871979242834039a5dd
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
drivers/clk/qcom/gcc-msm8996.c