tree 763cf48051077a19a906b305e0e29e79e790e785
parent 042e2e9c2c8bdd88e30160bfb587f825b0ce5407
parent 3320f39bee899b68d4f35220764b2ab213374708
author Stephen Boyd <sboyd@codeaurora.org> 1510682855 -0800
committer Stephen Boyd <sboyd@codeaurora.org> 1510682855 -0800

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