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

This commit is contained in:
Tony Lindgren 2012-11-13 13:52:38 -08:00
commit 9dc5764373
6 changed files with 188 additions and 91 deletions