Merge branch 'clk-next' into v4.3-rc1

2026-09-28 19:20:30 +00:00 · 2015-09-16 15:20:03 -07:00 · 2015-09-16 15:20:03 -07:00 · db544f1b58
commit db544f1b58
parent 6ff33f3902 e1595d89ae
6 changed files with 30 additions and 5 deletions
--- a/drivers/clk/h8300/clk-h8s2678.c
+++ b/drivers/clk/h8300/clk-h8s2678.c
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
--- a/drivers/clk/hisilicon/Makefile
+++ b/drivers/clk/hisilicon/Makefile
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
--- a/drivers/clk/rockchip/clk-rk3368.c
+++ b/drivers/clk/rockchip/clk-rk3368.c
--- a/drivers/clk/tegra/clk-dfll.c
+++ b/drivers/clk/tegra/clk-dfll.c