diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:48:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:48:57 +0100 |
commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /arch/x86/kernel/efi_32.c | |
parent | Merge branch 'tracing/fastboot' into cpus4096 (diff) | |
parent | sched: add missing arch_update_cpu_topology() call (diff) | |
download | linux-45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df.tar.xz linux-45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df.zip |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Diffstat (limited to 'arch/x86/kernel/efi_32.c')
0 files changed, 0 insertions, 0 deletions