Merge branch 'devel-dt-arch-timer' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 02:38:26 +0000 (19:38 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 02:38:26 +0000 (19:38 -0700)

Trivial merge