tree 0ed074be3f49c598167e3e134a0cc4f0f49b2ea6
parent a61373476127edac8bcc5ee9d68a74dc1b864f53
parent ec527c318036a65a083ef68d8ba95789d2212246
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1559897337 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1559897337 +0200

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