diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-11-16 11:10:58 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-11-16 11:10:58 -0800 |
| commit | c8616671af913ed2c5fb5b45f09c28599458ba1a (patch) | |
| tree | e2a51379a60ff5084fc59556d35f89bf3744b0b9 /net/core/link_watch.c | |
| parent | bdfdabfedc30c9574dde6198a1739d2be03bf934 (diff) | |
| parent | ac95330b96376550ae7a533d1396272d675adfa2 (diff) | |
Merge tag 'sunxi-clk-fixes-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-fixes
Pull Allwinner clock fixes from Maxime Ripard:
Two fixes, one for the old clock code, one for the new implementation.
* tag 'sunxi-clk-fixes-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
clk: sunxi: Fix M factor computation for APB1
clk: sunxi-ng: sun6i-a31: Force AHB1 clock to use PLL6 as parent
Diffstat (limited to 'net/core/link_watch.c')
0 files changed, 0 insertions, 0 deletions