| commit | bfe2a3c3b5bf479788d5d5c5561346be6b169043 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jan 23 10:20:15 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jan 23 10:20:15 2009 +0100 |
| tree | 652c987279db7cd841d556f7bb1a589b57fbd6cc | |
| parent | 77835492ed489c0b870f82f4c50687bd267acc0a [diff] | |
| parent | 35d266a24796f02f63299cfe5009dfc0d5a0e820 [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>