Skip to content
Commit a1716d50 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

parents 64e83b5a 4b4f7280
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment