diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 23:00:15 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 23:00:15 -0700 |
| commit | ac7da1b787d9ea43680c487613269742c48d8747 (patch) | |
| tree | c9d8be57984d46bb6e461386f95e3cdf59305db4 /drivers/nvdimm | |
| parent | 032405a754fb338812732eac449cd10173f13a1a (diff) | |
| parent | d47317ca4ade1a9a1c69c596defb273f29e263b3 (diff) | |
| parent | 96455f734b2f6491b07a9a5b0c94513f0f4c9144 (diff) | |
| parent | 81351776c9fbbbd0de1dc1542f30aacfe68efc4e (diff) | |
| parent | 7a8655e19bdb3be43f6a3b4768c9b0928a2585fc (diff) | |
| parent | 67075b3cb8d509642ff09ef3134a3b2d30c45a32 (diff) | |
Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk-scmi-round' and 'clk-cs2000-spdx' into clk-next
* clk-actions-s700:
: - Actions Semi Owl series S700 SoC clk driver
clk: actions: Add S700 SoC clock support
dt-bindings: clock: Add S700 support for Actions Semi Soc's
clk: actions: Add missing REGMAP_MMIO dependency
* clk-exynos-unused:
: - Remove an unused variable from Exynos4412 ISP driver
clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable
* clk-qcom-dispcc-845:
: - Qualcomm SDM845 display clock controller
clk: qcom: Add display clock controller driver for SDM845
dt-bindings: clock: Introduce QCOM Display clock bindings
clk: qcom: Move frequency table macro to common file
* clk-scmi-round:
: - Fix a thinko bug in SCMI clk division logic
clk: scmi: Fix the rounding of clock rate
* clk-cs2000-spdx:
clk: cs2000-cp: convert to SPDX identifiers