diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 03:44:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 03:44:15 -0500 |
| commit | 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 (patch) | |
| tree | 13ee81932cba73deb69cd3f386d80e45e6ac23de /arch/x86/include/asm/reboot.h | |
| parent | 02ac81a812fe0575a8475a93bdc22fb291ebad91 (diff) | |
| parent | 14392fd329eca9b59d51c0aa5d0acfb4965424d1 (diff) | |
Merge branch 'x86/numa' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/reboot.h')
0 files changed, 0 insertions, 0 deletions