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

Merge branch 'x86/crashdump' into cpus4096 

Conflicts:
	arch/x86/kernel/crash.c

Merged for semantic conflict:
	arch/x86/kernel/reboot.c
parents 948a7b2b c415b3dc
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment