Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Wed, 18 Dec 2013 14:14:11 +0000 (15:14 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Wed, 18 Dec 2013 14:14:36 +0000 (15:14 +0100)
 * clocksource: sh_cmt: Add clk_prepare/unprepare support

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
1  2 
drivers/clocksource/sh_cmt.c

Simple merge