commit | eca217b36e5d7d4377493d5cedd89105e66a5a72 | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@elte.hu> | Mon Feb 09 12:16:59 2009 +0100 |
committer | Ingo Molnar <mingo@elte.hu> | Mon Feb 09 12:16:59 2009 +0100 |
tree | 71f0ecd5225c3033d509b77a23ad7bc576cf0ab6 | |
parent | 54a353a0f845c1dad5fc8183872e750d667838ac [diff] | |
parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 [diff] |
Merge branch 'x86/paravirt' into x86/apic Conflicts: arch/x86/mach-voyager/voyager_smp.c