Merge branch 'pm-opp' into pm-cpufreq

This commit is contained in:
Rafael J. Wysocki 2014-12-18 01:43:16 +01:00
commit 437574c9cb