Merge branch 'omap-for-v3.9/pm' into omap-for-v3.9/tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 22:57:00 +0000 (14:57 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 22:57:00 +0000 (14:57 -0800)

Trivial merge