| commit | ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Mon May 02 14:16:37 2011 +0200 |
| committer | Tejun Heo <tj@kernel.org> | Mon May 02 14:16:47 2011 +0200 |
| tree | 70242f5927c6d6454bd352ff78f956cfc5238f59 | |
| parent | aff364860aa105b2deacc6f21ec8ef524460e3fc [diff] | |
| parent | 2be19102b71c1a45d37fec50303791daa1a06869 [diff] |
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>