diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:35 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:35 -0800 |
commit | bdf6bfb3782779c2bfce588fd24956f518f9fd9d (patch) | |
tree | 763cf48051077a19a906b305e0e29e79e790e785 /drivers/auxdisplay | |
parent | 042e2e9c2c8bdd88e30160bfb587f825b0ce5407 (diff) | |
parent | 3320f39bee899b68d4f35220764b2ab213374708 (diff) | |
download | talos-op-linux-bdf6bfb3782779c2bfce588fd24956f518f9fd9d.tar.gz talos-op-linux-bdf6bfb3782779c2bfce588fd24956f518f9fd9d.zip |
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
Diffstat (limited to 'drivers/auxdisplay')
0 files changed, 0 insertions, 0 deletions