diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-07 10:48:57 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-07 10:48:57 +0200 |
commit | a964d23c94e8177c501fc9a37dcf1f0dd2750527 (patch) | |
tree | 0ed074be3f49c598167e3e134a0cc4f0f49b2ea6 /virt | |
parent | PM: sleep: Add kerneldoc comments to some functions (diff) | |
parent | x86/power: Fix 'nosmt' vs hibernation triple fault during resume (diff) | |
download | linux-dev-a964d23c94e8177c501fc9a37dcf1f0dd2750527.tar.xz linux-dev-a964d23c94e8177c501fc9a37dcf1f0dd2750527.zip |
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
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions