Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 17:05:40 +0000 (10:05 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 17:05:40 +0000 (10:05 -0700)

Trivial merge