From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 7 Jun 2019 08:48:57 +0000 (+0200)
Subject: Merge branch 'pm-x86'
X-Git-Tag: microblaze-v5.4-rc1~565^2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a964d23c94e8177c501fc9a37dcf1f0dd2750527;p=linux-2.6-microblaze.git

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
---

a964d23c94e8177c501fc9a37dcf1f0dd2750527