Merge branch 'devel-board' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 23:14:02 +0000 (15:14 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 23:14:02 +0000 (15:14 -0800)

Trivial merge