Merge branch 'pm-fixes' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Jun 2013 20:01:35 +0000 (22:01 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Jun 2013 20:01:35 +0000 (22:01 +0200)
commit874e628f8b34cf4b3b7f471063841647c221f453
tree3bcca932475369dc501686e07f7e51fe092a9840
parentf4fd3797848aa04e72e942c855fd279840a47fe4
parentc28375583b6471c1cb833a628ab6afb5b69079d0
Merge branch 'pm-fixes' into pm-cpufreq

A subsequent commit depends on the 'pm-fixes' commits.