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)
commitaff364860aa105b2deacc6f21ec8ef524460e3fc
tree18409ebe16b25b141598da9b6386d69416c06afa
parentc7a7b814c9dca9ee01b38e63b4a46de87156d3b6
parent993ba1585cbb03fab012e41d1a5d24330a283b31
Merge branch 'x86/numa' into x86-mm

Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.

  3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
  993ba1585c: 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>