]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 22:29:07 +0000 (00:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 22:29:07 +0000 (00:29 +0200)
commit82638844d9a8581bbf33201cc209a14876eca167
tree961d7f9360194421a71aa644a9d0c176a960ce49
parent9982fbface82893e77d211fbabfbd229da6bdde6
parent63cf13b77ab785e87c867defa8545e6d4a989774
Merge branch 'linus' into cpus4096

Conflicts:

arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 files changed:
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/smpboot.c
arch/x86/xen/smp.c
drivers/infiniband/hw/ehca/ehca_irq.c
include/asm-x86/ipi.h
kernel/cpu.c
kernel/rcuclassic.c
kernel/rcupreempt.c
kernel/sched.c
kernel/sched_fair.c
kernel/sched_rt.c
kernel/time/tick-broadcast.c
net/core/dev.c
net/iucv/iucv.c