diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:24:52 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:24:52 -0500 |
| commit | 855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525 (patch) | |
| tree | f95e80165c293f43321b17c4280acfca478d9ba8 /include/linux/ppp_channel.h | |
| parent | 948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e (diff) | |
| parent | c415b3dce30dfb41234e118662e8720f47343a4f (diff) | |
Merge branch 'x86/crashdump' into cpus4096
Conflicts:
arch/x86/kernel/crash.c
Merged for semantic conflict:
arch/x86/kernel/reboot.c
Diffstat (limited to 'include/linux/ppp_channel.h')
0 files changed, 0 insertions, 0 deletions