diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-12-14 13:26:21 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-12-14 13:27:11 -0800 |
commit | f4ad7fba066f70ccd50816476e2f8700013c0724 (patch) | |
tree | 7bf4f152e70e8d09cb26cde26d10d855964f222d /net/ipv4/xfrm4_state.c | |
parent | aab184d23b4502c21f35a80e5e75fe7a78d00812 (diff) | |
parent | f071bcebee0ad2d8c3e22736210110523fb4b692 (diff) | |
parent | 922b8fae085d6561ef4a2d1527a14bfde82fd1e8 (diff) | |
parent | eaeee28db2893dc56a29751f19210dc8ce8247c3 (diff) | |
parent | f87d33e663d65d1c8a01585deb69aabb1aad0c6e (diff) | |
parent | c51ba54f6349e677d136dac4d45d628bf1f9524d (diff) | |
download | linux-f4ad7fba066f70ccd50816476e2f8700013c0724.tar.bz2 |
Merge branches 'clk-qcom-kconfig', 'clk-qcom-gpucc', 'clk-qcom-qcs404-rpm', 'clk-qcom-spi' and 'clk-qcom-videocc-binding' into clk-next
- Qualcomm SDM845 GPU clock controllers
- Qualcomm QCS404 RPM clk support
* clk-qcom-kconfig:
clk: qcom: Move to menuconfig and reduce lines
* clk-qcom-gpucc:
dt-bindings: clock: qcom: Fix the xo parent in gpucc example
clk: qcom: gpu_cc_gmu_clk_src has 5 parents, not 6
clk: qcom: Add a dummy enable function for GX gdsc
clk: qcom: gdsc: Don't override existing gdsc pd functions
clk: qcom: Add graphics clock controller driver for SDM845
dt-bindings: clock: Introduce QCOM Graphics clock bindings
* clk-qcom-qcs404-rpm:
clk: qcom: smd: Add support for QCS404 rpm clocks
* clk-qcom-spi:
clk: qcom: msm8916: Additional clock rates for spi
* clk-qcom-videocc-binding:
dt-bindings: clock: Require #reset-cells in sdm845-videocc