| commit | 8e4029ee3517084ae00fbfbcb51cc365d8857061 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Mon Oct 11 17:05:11 2010 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Mon Oct 11 17:05:11 2010 -0700 |
| tree | 3d86578dc6160781a0c2fdad461e5195e73bfafc | |
| parent | cd79481d27b9f90aad80c9b972292c42c25bbf8e [diff] | |
| parent | 73cf624d029d776a33d0a80c695485b3f9b36231 [diff] |
Merge branch 'x86/urgent' into core/memblock Reason for merge: Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree. Resolved Conflicts: arch/x86/mm/srat_64.c Originally-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>