Merge branch 'x86/s2ram-fix' into x86/urgent