Skip to content
Commit 1d96ad64 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-uniphier' into clk-next 

* clk-uniphier:
  clk: uniphier: fix DAPLL2 clock rate of Pro5
  clk: uniphier: fix parent of miodmac clock data
parents e8d07fd2 67affb78
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment