Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 19:30:12 +0000 (11:30 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 19:30:12 +0000 (11:30 -0800)

Trivial merge