diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-08-15 08:58:49 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-15 08:58:49 +0300 |
commit | 4a18ef5babd1bac0c746e87d1b94a7696fcd36be (patch) | |
tree | dcb971c76e191c400208e1f03947edd5b11eca27 | |
parent | d16adaf0b92fc356537ba38d94590b8ed50e3552 (diff) | |
parent | 9c7e47025a6b9a2800eec127996ad58946e0cad4 (diff) | |
parent | f9419783a6b45a7198ea22f2997cf1a85fda8458 (diff) | |
parent | 365f7a89c881e84f1ebc925f65f899d5d7ce547e (diff) | |
parent | f6dab4233d6b64d719109040503b567f71fbfa01 (diff) | |
parent | 8927c27b32703e28041ae19bf25ea53461be83a1 (diff) | |
download | linux-4a18ef5babd1bac0c746e87d1b94a7696fcd36be.tar.xz |
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