| commit | 9042763808c5285a1a61b45b0fe98a710a4c903c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Sep 05 09:21:21 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Sep 05 09:21:21 2008 +0200 |
| tree | 349be736a3b56a64c8835df03f127959bfc6e0e0 | |
| parent | 446d27338d3b422dd3dfe496d0f362230994d059 [diff] | |
| parent | aa3341a168883654d1b13f5931c5ed2762537831 [diff] |
Merge branch 'x86/x2apic' into x86/core Conflicts: arch/x86/kernel/cpu/common_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>