Merge branch 'devel-board'
authorTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 22:31:09 +0000 (14:31 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 22:31:09 +0000 (14:31 -0800)

Trivial merge