arch/x86/include/asm/irq_vectors.h · bfe2a3c3b5bf479788d5d5c5561346be6b169043 · Kirill Smelkov / linux

Merge branch 'core/percpu' into perfcounters/core · bfe2a3c3

Ingo Molnar authored Jan 23, 2009

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>

bfe2a3c3

irq_vectors.h 4.83 KB

Replace irq_vectors.h