Merge branches 'omap-fixes', 'omap-for-linus', 'devel-omap1' and 'devel-omap2plus...
authorTony Lindgren <tony@atomide.com>
Wed, 29 Sep 2010 18:01:16 +0000 (11:01 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Sep 2010 18:01:16 +0000 (11:01 -0700)

Trivial merge