Merge branch 'x86/irq' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 11:00:02 +0000 (12:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 11:00:14 +0000 (12:00 +0100)
commit92bf73e90a35d40ebc1446488218f03833b36f86
tree8aaae58fcb7f3e06e63a5214f910acf47f4cc9d6
parent447557ac7ce120306b4a31d6003faef39cb1bf14
parent915b0d0104b72fd36af088ba4b11b5690bc96a6c
Merge branch 'x86/irq' into perfcounters/core

( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )
arch/x86/include/asm/hardirq_32.h
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/perf_counter.c
kernel/fork.c
kernel/sched.c