projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aff3648 2be1910)
Merge branch 'x86/urgent' into x86-mm
authorTejun Heo <tj@kernel.org>
Mon, 2 May 2011 12:16:37 +0000 (14:16 +0200)
committerTejun Heo <tj@kernel.org>
Mon, 2 May 2011 12:16:47 +0000 (14:16 +0200)
commitba67cf5cf2ce10ad86a212b70f8c7c75d93a5016
tree70242f5927c6d6454bd352ff78f956cfc5238f59tree | snapshot
parentaff364860aa105b2deacc6f21ec8ef524460e3fccommit | diff
parent2be19102b71c1a45d37fec50303791daa1a06869commit | 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>
arch/x86/mm/numa_64.c diff1 | diff2 | blob | history
arch/x86/mm/srat_32.c diff1 | diff2 | blob | history
drivers/acpi/processor_throttling.c diff1 | diff2 | blob | history
John Crispins staging tree