Skip to content
Commit 98aefbe7 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14 



 * clocksource: sh_cmt: Add clk_prepare/unprepare support

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parents 6d19944b 57dee992
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment