| commit | ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016 | |
| author | Tejun Heo <tj@kernel.org> | |
| Mon, 2 May 2011 12:16:37 +0000 (2 14:16 +0200) | ||
| committer | Tejun Heo <tj@kernel.org> | |
| Mon, 2 May 2011 12:16:47 +0000 (2 14:16 +0200) | ||
| tree | 70242f5927c6d6454bd352ff78f956cfc5238f59 | treesnapshot (tar.gz zip) |
| parent | aff364860aa105b2deacc6f21ec8ef524460e3fc | commitdiff |
| parent | 2be19102b71c1a45d37fec50303791daa1a06869 | commitdiff |
Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
| arch/x86/mm/numa_64.c | diff1 | diff2 | blobhistory |
| arch/x86/mm/srat_32.c | diff1 | diff2 | blobhistory |
| drivers/acpi/processor_throttling.c | diff1 | diff2 | blobhistory |