Merge branch 'fortglx/3.1/tip/timers/rtc' of git://git.linaro.org/people/jstultz...