]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-x86'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Jun 2019 08:48:57 +0000 (10:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Jun 2019 08:48:57 +0000 (10:48 +0200)
commita1b844831b394ab6c0b4335e743b7dbdb4667d6c
tree0ed074be3f49c598167e3e134a0cc4f0f49b2ea6
parentfe6edc989d64e785c47e58e36f5d2c4069eabd26
parent777a665da084c139ac3a72571cf77e101814bfcd
Merge branch 'pm-x86'

* pm-x86:
  x86/power: Fix 'nosmt' vs hibernation triple fault during resume
  x86: intel_epb: Do not build when CONFIG_PM is unset
kernel/power/hibernate.c