Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 23:28:54 +0000 (15:28 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 23:28:54 +0000 (15:28 -0800)

Trivial merge