git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9982fbf 63cf13b)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Jul 2008 22:29:07 +0000 (00:29 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Jul 2008 22:29:07 +0000 (00:29 +0200)
commit	82638844d9a8581bbf33201cc209a14876eca167
tree	961d7f9360194421a71aa644a9d0c176a960ce49	tree
parent	9982fbface82893e77d211fbabfbd229da6bdde6	commit \| diff
parent	63cf13b77ab785e87c867defa8545e6d4a989774	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/smp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/ehca/ehca_irq.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ipi.h	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/rcuclassic.c	diff1 \|	diff2 \|	blob \| history
kernel/rcupreempt.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_rt.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-broadcast.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/iucv/iucv.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.