Merge branch 'devel-dt-arch-timer' into devel-dt
authorTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 18:42:24 +0000 (11:42 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 18:42:24 +0000 (11:42 -0700)

Trivial merge