Merge branch 'devel-board'
authorTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 19:01:28 +0000 (12:01 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 19:01:28 +0000 (12:01 -0700)

Trivial merge