Merge branches 'omap-fixes' and 'omap-boards' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 5 Nov 2010 22:05:06 +0000 (15:05 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 5 Nov 2010 22:05:06 +0000 (15:05 -0700)

Trivial merge