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