diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 17:39:52 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 17:39:52 +0100 |
commit | 0936912274af78a21fd8d54c3f94a50a285cf7f9 (patch) | |
tree | b8082ba0fbd37c4283c0065266376539de399b14 /arch/x86/kernel/mpparse.c | |
parent | 87c6fe26186d734e932426cc8ab9fd8cf9aeed94 (diff) | |
parent | 9e9197370dafa7ebc7191d835f0403b13855ca35 (diff) | |
parent | 40bcc69b399ddbcd2d5c52b277a1b27398339b27 (diff) |
Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent