Commits
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer Conflicts: arch/arm/mach-omap2/timer.c
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer Conflicts: arch/arm/mach-omap2/timer.c