projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7783549 35d266a)
Merge branch 'core/percpu' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 09:20:15 +0000 (10:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 09:20:15 +0000 (10:20 +0100)
commitbfe2a3c3b5bf479788d5d5c5561346be6b169043
tree652c987279db7cd841d556f7bb1a589b57fbd6cctree | snapshot
parent77835492ed489c0b870f82f4c50687bd267acc0acommit | diff
parent35d266a24796f02f63299cfe5009dfc0d5a0e820commit | diff
Merge branch 'core/percpu' into perfcounters/core

Conflicts:
arch/x86/include/asm/hardirq_32.h
arch/x86/include/asm/hardirq_64.h

Semantic merge:
arch/x86/include/asm/hardirq.h
[ added apic_perf_irqs field. ]

Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/include/asm/hardirq.h diff1 | diff2 | blob | history
arch/x86/include/asm/irq_vectors.h diff1 | diff2 | blob | history
arch/x86/include/asm/mach-default/entry_arch.h diff1 | diff2 | blob | history
arch/x86/kernel/apic.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common.c diff1 | diff2 | blob | history
arch/x86/kernel/entry_64.S diff1 | diff2 | blob | history
arch/x86/kernel/irqinit_32.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/exit.c diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;