diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:37 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:47 +0200 |
commit | ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016 (patch) | |
tree | 70242f5927c6d6454bd352ff78f956cfc5238f59 /drivers/acpi/container.c | |
parent | Merge branch 'x86/numa' into x86-mm (diff) | |
parent | x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo() (diff) | |
download | linux-ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016.tar.xz linux-ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016.zip |
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>
Diffstat (limited to 'drivers/acpi/container.c')
0 files changed, 0 insertions, 0 deletions