Merge branches 'omap-fixes', 'omap-for-linus' and 'devel-omap1' into for-next
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 22:55:28 +0000 (15:55 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 22:55:28 +0000 (15:55 -0700)

Trivial merge