diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-23 01:25:18 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-23 01:25:18 +0100 |
| commit | 54b56170e4517e9606b245c3f805fc96baa059f0 (patch) | |
| tree | 9f8750ef972b4a7fdce530889dcbaf2a8b5b0d05 /kernel/posix-cpu-timers.c | |
| parent | x86, apic: Remove ioapic_disable_legacy() (diff) | |
| parent | Merge branch 'x86/irq' into x86/apic (diff) | |
| download | linux-54b56170e4517e9606b245c3f805fc96baa059f0.tar.xz linux-54b56170e4517e9606b245c3f805fc96baa059f0.zip | |
Merge remote branch 'origin/x86/apic' into x86/mrst
Conflicts:
arch/x86/kernel/apic/io_apic.c
Diffstat (limited to 'kernel/posix-cpu-timers.c')
0 files changed, 0 insertions, 0 deletions