| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Tue, 23 Dec 2008 15:24:15 +0000 (23 16:24 +0100) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Tue, 23 Dec 2008 15:24:15 +0000 (23 16:24 +0100) | ||
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 | treesnapshot (tar.gz zip) |
| parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 | commitdiff |
| parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 | commitdiff |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Conflicts:
arch/x86/kernel/apic.c
| arch/x86/kernel/apic.c | diff1 | diff2 | blobhistory |