summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2018-08-15 07:58:49 +0200
committerStephen Boyd <sboyd@kernel.org>2018-08-15 07:58:49 +0200
commit4a18ef5babd1bac0c746e87d1b94a7696fcd36be (patch)
treedcb971c76e191c400208e1f03947edd5b11eca27
parentMerge branches 'clk-mvebu-spdx', 'clk-meson', 'clk-imx7d-mu', 'clk-imx-init-a... (diff)
parentclk: qcom: clk-rpmh: Add QCOM RPMh clock driver (diff)
parentclk: qcom: Update SPDX headers for common files (diff)
parentclk: core: Potentially free connection id (diff)
parentclk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure (diff)
parentclk: mvebu: armada-37xx-periph: Remove unused var num_parents (diff)
downloadlinux-4a18ef5babd1bac0c746e87d1b94a7696fcd36be.tar.xz
linux-4a18ef5babd1bac0c746e87d1b94a7696fcd36be.zip
Merge branches 'clk-qcom-rpmh', 'clk-qcom-spdx', 'clk-con-id-leak', 'clk-fixed-factor-populated' and 'clk-mvebu-periph-parent' into clk-next
* clk-qcom-rpmh: : - Qualcomm RPMh clk driver clk: qcom: clk-rpmh: Add QCOM RPMh clock driver * clk-qcom-spdx: : - SPDX tagging for qcom clk: qcom: Update SPDX headers for common files * clk-con-id-leak: : - Stop leaking con ids in __clk_put() clk: core: Potentially free connection id * clk-fixed-factor-populated: : - Fix a corner case in fixed factor clk probing where node is in DT but : parent clk is registered much later clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure * clk-mvebu-periph-parent: : - Marvell Armada 3700 clk_pm_cpu_get_parent() had an invalid return value clk: mvebu: armada-37xx-periph: Remove unused var num_parents clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent