Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer
authorTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 21:52:38 +0000 (13:52 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 21:52:38 +0000 (13:52 -0800)

Trivial merge