commit | 98aefbe72ec6015f90fe045ed16c5cf755da283d | [log] [tgz] |
---|---|---|
author | Daniel Lezcano <daniel.lezcano@linaro.org> | Wed Dec 18 15:14:11 2013 +0100 |
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | Wed Dec 18 15:14:36 2013 +0100 |
tree | 35d12ac4d3ee7e3c12aa8825ecb490430d8e5030 | |
parent | 6d19944bd2609a1d7d48149605aa9f62ca8bf640 [diff] | |
parent | 57dee992df244ccce6a6a3a88a43160e285da5d8 [diff] |
Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14 * clocksource: sh_cmt: Add clk_prepare/unprepare support Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>