| commit | de65d816aa44f9ddd79861ae21d75010cc1fd003 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Tue Jan 29 14:59:09 2013 -0800 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Tue Jan 29 15:10:15 2013 -0800 |
| tree | 04a637a43b2e52a733d0dcb7595a47057571e7da | |
| parent | 9710f581bb4c35589ac046b0cfc0deb7f369fc85 [diff] | |
| parent | 5dcd14ecd41ea2b3ae3295a9b30d98769d52165f [diff] |
Merge remote-tracking branch 'origin/x86/boot' into x86/mm2 Coming patches to x86/mm2 require the changes and advanced baseline in x86/boot. Resolved Conflicts: arch/x86/kernel/setup.c mm/nobootmem.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>