Merge branch 'slub/hotplug' into slab/urgent
authorPekka Enberg <penberg@kernel.org>
Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
committerPekka Enberg <penberg@kernel.org>
Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
commit597fb188cbee2d371246e1669bbc6051bb666aa9
treefd9cb605050ca15274cf391dc6bd4073d04808df
parent38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5
parent04d94879c8a4973b5499dc26b9d38acee8928791
Merge branch 'slub/hotplug' into slab/urgent
include/linux/memory_hotplug.h
mm/memory_hotplug.c
mm/slub.c