git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Mike Travis <travis@sgi.com>
	Thu, 1 Jan 2009 01:34:16 +0000 (17:34 -0800)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 3 Jan 2009 17:53:31 +0000 (18:53 +0100)
commit	3ecb7dff7fd95be132712c9899c33a4504514dec
tree	ef1a3beae706b9497c845d0a2557ceb4d2754998	tree \| snapshot
parent	7bf16fdf067334b8a2a0cf53d4e531fee258099c	commit \| diff
parent	b3c2c7e75adbf117175ebcc3c5c15b1ce3a22f96	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

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>

29 files changed:

arch/ia64/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/mach-ip27/topology.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_amd_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup_percpu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/rcuclassic.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/sched_stats.h	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/ia64/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/mach-ip27/topology.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_amd_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup_percpu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/rcuclassic.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/sched_stats.h	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history