Merge commit '7185684' into omap-for-v3.10/timer