Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kernel/time/tick-sched.c Signed-off-by: Mike Travis <travis@sgi.com> [ mingo@elte.hu: backmerged typo fix for io_apic.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
k7.c | ||
Makefile | ||
mce.h | ||
mce_32.c | ||
mce_64.c | ||
mce_amd_64.c | ||
mce_intel_64.c | ||
non-fatal.c | ||
p4.c | ||
p5.c | ||
p6.c | ||
therm_throt.c | ||
winchip.c |