Merge branch 'devel-dmtimer' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 14 Jun 2012 10:00:23 +0000 (03:00 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 14 Jun 2012 10:00:23 +0000 (03:00 -0700)

Trivial merge