Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
authorTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 21:25:38 +0000 (13:25 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 21:25:38 +0000 (13:25 -0800)

Trivial merge