Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap...