Merge branches 'omap-fixes', 'omap-for-linus' and 'devel-board' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 00:17:52 +0000 (16:17 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 00:17:52 +0000 (16:17 -0800)

Trivial merge