diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-17 17:20:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 17:20:11 +0100 |
| commit | 0b6de0092244c98b5ba1abda34c92470a20e0d0c (patch) | |
| tree | 478e4e18c33fd9fa517559e1ce951fe378d5965f /scripts/patch-kernel | |
| parent | perfcounters: fix acpi_idle_do_entry() workaround (diff) | |
| parent | x86, apic: move APIC drivers to arch/x86/kernel/apic/* (diff) | |
Merge branch 'x86/apic' into perfcounters/core
Conflicts:
arch/x86/kernel/cpu/perfctr-watchdog.c
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions