diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:42:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:43:54 +0100 |
| commit | 02ac81a812fe0575a8475a93bdc22fb291ebad91 (patch) | |
| tree | 690f1b48b070f5e268d51c54b63943dc3b807e50 /arch/x86/kernel/smpboot.c | |
| parent | 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 (diff) | |
| parent | d2137d5af4259f50c19addb8246a186c9ffac325 (diff) | |
Merge branch 'x86/bootmem' into x86/mm
Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree
and prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
0 files changed, 0 insertions, 0 deletions