From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Wed, 18 Dec 2013 14:14:11 +0000 (+0100)
Subject: Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14
X-Git-Tag: kvm-3.14-2~53^2~1^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=98aefbe72ec6015f90fe045ed16c5cf755da283d;p=users%2Fdwmw2%2Flinux.git

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>
---

98aefbe72ec6015f90fe045ed16c5cf755da283d