Merge branch 'devel-dt-arch-timer' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 21 Sep 2012 21:19:21 +0000 (14:19 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 21 Sep 2012 21:19:21 +0000 (14:19 -0700)

Trivial merge