Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 23 May 2014 07:23:21 +0000 (09:23 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 23 May 2014 07:23:21 +0000 (09:23 +0200)
1  2 
drivers/clocksource/sh_tmu.c

Simple merge