Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 01:43:45 +0000 (18:43 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 01:43:45 +0000 (18:43 -0700)

Trivial merge