Merge branch 'clk-determine-rate-struct' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 28 Jul 2015 18:51:30 +0000 (11:51 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 28 Jul 2015 18:51:30 +0000 (11:51 -0700)
* clk-determine-rate-struct:
  clk: fix some determine_rate implementations
  clk: change clk_ops' ->determine_rate() prototype

1  2 
drivers/clk/clk.c
drivers/clk/qcom/clk-pll.c
drivers/clk/qcom/clk-rcg2.c
include/linux/clk-provider.h

Simple merge
Simple merge
Simple merge
Simple merge