Merge branch 'omap-for-v3.9/pm-fix'
authorTony Lindgren <tony@atomide.com>
Tue, 12 Feb 2013 17:35:12 +0000 (09:35 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 12 Feb 2013 17:35:12 +0000 (09:35 -0800)

Trivial merge