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