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)
commit98aefbe72ec6015f90fe045ed16c5cf755da283d
tree35d12ac4d3ee7e3c12aa8825ecb490430d8e5030
parent6d19944bd2609a1d7d48149605aa9f62ca8bf640
parent57dee992df244ccce6a6a3a88a43160e285da5d8
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>
drivers/clocksource/sh_cmt.c