Merge branch 'devel-dmtimer'
authorTony Lindgren <tony@atomide.com>
Thu, 14 Jun 2012 09:55:14 +0000 (02:55 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 14 Jun 2012 09:55:14 +0000 (02:55 -0700)

Trivial merge