]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f2d29e 07d0081)
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)
commit50526cd72e8f33040ca8c65a746724796e663c05
tree70242f5927c6d6454bd352ff78f956cfc5238f59tree | snapshot
parent8f2d29e8bd5559a9e463d2b54d8348e725647294commit | diff
parent07d0081b7a63bf1d5cf44ea2efefe56b4bd2dfddcommit | diff
Merge branch 'x86/urgent' into x86-mm

Merge reason: Pick up the following two fix commits.

  07d0081b7a: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
  405541ab04: 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
Linux Kernel Source Tree.