commit | dbdf6ff51e3ce13ade5834b0d7d451522fcdb478 | [log] [tgz] |
---|---|---|
author | Mike Turquette <mturquette@linaro.org> | Tue Dec 31 11:35:12 2013 -0800 |
committer | Mike Turquette <mturquette@linaro.org> | Tue Dec 31 11:35:12 2013 -0800 |
tree | b5594d70cf4d484101891adbfc01798c14827fa8 | |
parent | 391e3903e63781debc52a0de73f2e922dcc3f602 [diff] | |
parent | 9ffe29d780dd5f9c662f2c32f8dc64435da726bf [diff] |
Merge branch 'clk-next-unregister' into clk-next Conflicts: drivers/clk/clk.c