]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'x86/numa' into x86-mm
authorTejun Heo <tj@kernel.org>
Mon, 2 May 2011 12:08:43 +0000 (14:08 +0200)
committerTejun Heo <tj@kernel.org>
Mon, 2 May 2011 12:08:47 +0000 (14:08 +0200)
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 78704defea^..1fc3646eea.

  78704defea: x86-32, numa: Fix failure condition check in alloc_remap()
  1fc3646eea: x86-32, numa: Update remap allocator comments

Scheduled NUMA init 32/64bit unification changes depend on them.

Signed-off-by: Tejun Heo <tj@kernel.org>

Trivial merge