diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 13:52:05 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 13:52:05 -0700 |
| commit | ba857b212210df018adb5885656c9e890062f883 (patch) | |
| tree | 6f3b54e33004117b757dfa17d609d47cd9cce583 /net/unix/af_unix.c | |
| parent | clk: Drop duplicate selection in Kconfig (diff) | |
| parent | clk: Specify IOMEM dependency for HSDK pll driver (diff) | |
| download | linux-ba857b212210df018adb5885656c9e890062f883.tar.gz linux-ba857b212210df018adb5885656c9e890062f883.zip | |
Merge branch 'clk-fixes' into clk-kconfig
Need to merge this up to get the IOMEM dependency patch on top that is
broken and fixed in the next commit.
* clk-fixes:
clk: Specify IOMEM dependency for HSDK pll driver
clk: AST2600: Add mux for EMMC clock
clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions