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

Trivial merge