Merge branch 'devel-board'
authorTony Lindgren <tony@atomide.com>
Sat, 11 Dec 2010 02:07:11 +0000 (18:07 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 11 Dec 2010 02:07:11 +0000 (18:07 -0800)

Trivial merge