diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:24:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:24:15 +0100 |
| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /kernel/irq/pm.c | |
| parent | x86: hardirq: use inc_irq_stat() in non-unified functions (diff) | |
| parent | Merge commit 'v2.6.28-rc9' into x86/apic (diff) | |
| download | wireguard-linux-bf8bd66d0580f296f257d371ee41a0a137b541c7.tar.xz wireguard-linux-bf8bd66d0580f296f257d371ee41a0a137b541c7.zip | |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Diffstat (limited to 'kernel/irq/pm.c')
0 files changed, 0 insertions, 0 deletions