diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-27 03:43:32 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-27 03:43:32 +0300 |
commit | 4d1d13a5ae8d468923106d5b05de407bc25cefa2 (patch) | |
tree | 12b9be02ca6246c96d07326cbba19d3db5d38a6c /arch/s390/include/asm/sysinfo.h | |
parent | 716d9b1d4a88493ec3e52957cc1026d32534ee67 (diff) | |
parent | bfc0cbfcad122c27aefad0e00da4f383954cf145 (diff) | |
parent | db3188fadfe6af73d2485131a6975c032306e1ea (diff) | |
parent | ade98cbc2bf0b2040707dc39983411139911960e (diff) | |
parent | 9d548d80384732bad74c3046329e5dbdae098104 (diff) | |
download | linux-4d1d13a5ae8d468923106d5b05de407bc25cefa2.tar.xz |
Merge branches 'clk-remove-asm-clkdev', 'clk-debugfs-fixes', 'clk-renesas' and 'clk-meson' into clk-next
* clk-remove-asm-clkdev:
clk: Move __clk_{get,put}() into private clk.h API
clk: sunxi: Use CLK_IS_CRITICAL flag for critical clks
arch: Remove clkdev.h asm-generic from Kbuild
clk: Prepare to remove asm-generic/clkdev.h
blackfin: Use generic clkdev.h header
* clk-debugfs-fixes:
clk: Simplify debugfs registration
clk: Fix debugfs_create_*() usage
clk: Show symbolic clock flags in debugfs
clk: Improve flags doc for of_clk_detect_critical()
* clk-renesas:
clk: renesas: r8a7796: Add FDP clock
clk: renesas: cpg-mssr: Keep wakeup sources active during system suspend
clk: renesas: mstp: Keep wakeup sources active during system suspend
clk: renesas: r8a77970: Add LVDS clock
* clk-meson:
clk: meson-axg: fix potential NULL dereference in axg_clkc_probe()
clk: meson-axg: make local symbol axg_gp0_params_table static
clk: meson-axg: fix return value check in axg_clkc_probe()
clk: meson: mpll: use 64-bit maths in params_from_rate
clk: meson-axg: add clock controller drivers
clk: meson-axg: add clocks dt-bindings required header
dt-bindings: clock: add compatible variant for the Meson-AXG
clk: meson: make the spinlock naming more specific
clk: meson: gxbb: remove IGNORE_UNUSED from mmc clocks
clk: meson: gxbb: fix wrong clock for SARADC/SANA