diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:21:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:21:21 +0200 |
| commit | 9042763808c5285a1a61b45b0fe98a710a4c903c (patch) | |
| tree | 349be736a3b56a64c8835df03f127959bfc6e0e0 /Makefile | |
| parent | Merge branch 'x86/cpu' into x86/core (diff) | |
| parent | Merge branch 'x86/cpu' into x86/x2apic (diff) | |
| download | linux-9042763808c5285a1a61b45b0fe98a710a4c903c.tar.xz linux-9042763808c5285a1a61b45b0fe98a710a4c903c.zip | |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
arch/x86/kernel/cpu/common_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions