Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 16 May 2014 14:08:32 +0000 (16:08 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 16 May 2014 14:08:32 +0000 (16:08 +0200)

Trivial merge