| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Dec 23 16:24:15 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Dec 23 16:24:15 2008 +0100 |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 | |
| parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 [diff] | |
| parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 [diff] |
Merge branch 'x86/apic' into x86/irq Conflicts: arch/x86/kernel/apic.c