git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Jul 2008 19:55:59 +0000 (21:55 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Jul 2008 19:55:59 +0000 (21:55 +0200)
commit	1a781a777b2f6ac46523fe92396215762ced624d
tree	4f34bb4aade85c0eb364b53d664ec7f6ab959006	tree \| snapshot
parent	b9d2252c1e44fa83a4e65fdc9eb93db6297c55af	commit \| diff
parent	42a2f217a5e324ed5f2373ab1b7a0a15187c4d6c	commit \| diff

Merge branch 'generic-ipi' into generic-ipi-for-linus

Conflicts:

arch/powerpc/Kconfig
arch/s390/kernel/time.c
arch/x86/kernel/apic_32.c
arch/x86/kernel/cpu/perfctr-watchdog.c
arch/x86/kernel/i8259_64.c
arch/x86/kernel/ldt.c
arch/x86/kernel/nmi_64.c
arch/x86/kernel/smpboot.c
arch/x86/xen/smp.c
include/asm-x86/hw_irq_32.h
include/asm-x86/hw_irq_64.h
include/asm-x86/mach-default/irq_vectors.h
include/asm-x86/mach-voyager/irq_vectors.h
include/asm-x86/smp.h
kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

40 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/appldata/appldata_base.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mtrr/main.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perfctr-watchdog.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpuid.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_64.c	diff1 \|	\|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/nmi.c	diff1 \|	\|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vsyscall_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/voyager_smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/oprofile/nmi_int.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-ops.h	diff1 \|	diff2 \|	blob \| history
fs/buffer.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	\|	blob \| history
include/asm-x86/smp.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/hrtimer.c	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-broadcast.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/slab.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history
net/iucv/iucv.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/appldata/appldata_base.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mtrr/main.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perfctr-watchdog.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpuid.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_64.c	diff1 \|	\|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/nmi.c	diff1 \|	\|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vsyscall_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/voyager_smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/oprofile/nmi_int.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-ops.h	diff1 \|	diff2 \|	blob \| history
fs/buffer.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	\|	blob \| history
include/asm-x86/smp.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/hrtimer.c	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-broadcast.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/slab.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history
net/iucv/iucv.c	diff1 \|	diff2 \|	blob \| history