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

Trivial merge