projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a613734 ec527c3)
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)
* pm-x86:
  x86/power: Fix 'nosmt' vs hibernation triple fault during resume
  x86: intel_epb: Do not build when CONFIG_PM is unset

1  2 
kernel/power/hibernate.c patch | diff1 | diff2 | blob | history

diff --cc kernel/power/hibernate.c
Simple merge
MicroBlaze GIT Repository