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)
commit57386798f7db7f09d69f3b44fc66570e6db91bba
treec5e5134535a4019005a3b8d089ea54049f4cdc1d
parentec6415dc4160c3b312c0ac6143e5f587837bbd1f
parent4e88f3de89fbb7b5a5a0aca20376b276d26732ac
Merge branch 'clk-has-parent' into clk-next
drivers/clk/clk.c