Merge branch 'slub/hotplug' into slab/urgent
Pekka Enberg [Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)]
1  2 
include/linux/memory_hotplug.h
mm/memory_hotplug.c
mm/slub.c

Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge