Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3...
authorTony Lindgren <tony@atomide.com>
Wed, 21 Nov 2012 17:46:19 +0000 (09:46 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 21 Nov 2012 17:46:19 +0000 (09:46 -0800)

Trivial merge