From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 14 Nov 2017 18:07:35 +0000 (-0800)
Subject: Merge branch 'clk-hikey' into clk-next
X-Git-Tag: v4.15-rc1~48^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdf6bfb3782779c2bfce588fd24956f518f9fd9d;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'clk-hikey' into clk-next

* clk-hikey:
  clk: hi3798cv200: correct parent mux clock for 'clk_sdio0_ciu'
  clk: hisilicon: Delete an error message for a failed memory allocation in hisi_register_clkgate_sep()
  clk: hi3660: fix incorrect uart3 clock freqency
  clk: hi6220: mark clock cs_atb_syspll as critical
---

bdf6bfb3782779c2bfce588fd24956f518f9fd9d