Merge branch 'devel-dmtimer' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 29 Jun 2012 14:29:13 +0000 (07:29 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 29 Jun 2012 14:29:13 +0000 (07:29 -0700)

Trivial merge