Merge branch 'clk-fixes' into clk-next

author Stephen Boyd <sboyd@codeaurora.org>

Thu, 12 Mar 2015 00:07:37 +0000 (17:07 -0700)

committer Stephen Boyd <sboyd@codeaurora.org>

Thu, 12 Mar 2015 19:20:36 +0000 (12:20 -0700)
author Stephen Boyd <sboyd@codeaurora.org>
Thu, 12 Mar 2015 00:07:37 +0000 (17:07 -0700)
committer Stephen Boyd <sboyd@codeaurora.org>
Thu, 12 Mar 2015 19:20:36 +0000 (12:20 -0700)
diff --cc drivers/clk/clk.c
Simple merge
diff --cc drivers/clk/qcom/lcc-ipq806x.c
Simple merge
author	Stephen Boyd <sboyd@codeaurora.org>
	Thu, 12 Mar 2015 00:07:37 +0000 (17:07 -0700)
committer	Stephen Boyd <sboyd@codeaurora.org>
	Thu, 12 Mar 2015 19:20:36 +0000 (12:20 -0700)
		1	2
drivers/clk/clk.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/qcom/lcc-ipq806x.c	patch \|	diff1 \|	diff2 \|	blob \| history