Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2
authorTony Lindgren <tony@atomide.com>
Wed, 14 Nov 2012 22:50:36 +0000 (14:50 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 14 Nov 2012 22:50:36 +0000 (14:50 -0800)

Trivial merge