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

Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c
parents 103ceffb b840d796
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