tree b9606a77ef48f4288d29147f19be4bd0d0c6a9db
parent 67615c588a059b731df9d019edc3c561d8006ec9
parent e4abe2b9ab3ac79537d99dfceff7302739a586bc
author Stephen Boyd <sboyd@codeaurora.org> 1473364630 -0700
committer Stephen Boyd <sboyd@codeaurora.org> 1473364630 -0700

Merge branch 'clk-fixes' into clk-next

* clk-fixes:
  clk: sunxi-ng: Fix wrong reset register offsets
  clk: sunxi-ng: nk: Make ccu_nk_find_best static
  clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock
  clk: sunxi: Fix return value check in sun8i_a23_mbus_setup()
  clk: sunxi: pll2: Fix return value check in sun4i_pll2_setup()