Merge branch 'clk-has-parent' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Sun, 25 Jan 2015 00:58:40 +0000 (16:58 -0800)
committerMichael Turquette <mturquette@linaro.org>
Sun, 25 Jan 2015 00:58:40 +0000 (16:58 -0800)
1  2 
drivers/clk/clk.c

Simple merge