Merge branch 'devel-board' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 2 Jul 2012 12:30:13 +0000 (05:30 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 2 Jul 2012 12:30:13 +0000 (05:30 -0700)

Trivial merge