Merge branch 'cleanup-timer' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:16:45 +0000 (09:16 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:16:45 +0000 (09:16 -0700)

Trivial merge