Merge branch 'x86/crashdump' into cpus4096

Browse source

Conflicts:
	arch/x86/kernel/crash.c

Merged for semantic conflict:
	arch/x86/kernel/reboot.c

...

This commit is contained in:

Ingo Molnar 2008-12-17 13:24:52 +01:00

parent 948a7b2b5e c415b3dce3

commit 855caa37b9

7 changed files with 207 additions and 211 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

31

arch/x86/include/asm/kexec.h

View file

5

arch/x86/include/asm/reboot.h

View file

75

arch/x86/kernel/crash.c

View file

104

arch/x86/kernel/machine_kexec_32.c

View file

92

arch/x86/kernel/reboot.c

View file

115

arch/x86/kernel/relocate_kernel_32.S

View file

4

include/linux/kexec.h

View file