Merge branches 'omap-for-linus' and 'devel-gpmc' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:24:52 +0000 (17:24 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:24:52 +0000 (17:24 -0800)

Trivial merge