Merge branch 'slub/hotplug' into slab/urgent

author Pekka Enberg <[email protected]>

Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)

committer Pekka Enberg <[email protected]>

Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
author Pekka Enberg <[email protected]>
Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
committer Pekka Enberg <[email protected]>
Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
diff --cc include/linux/memory_hotplug.h
Simple merge
diff --cc mm/memory_hotplug.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Pekka Enberg <[email protected]>
	Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
committer	Pekka Enberg <[email protected]>
	Sat, 15 Jan 2011 11:28:17 +0000 (13:28 +0200)
		1	2
include/linux/memory_hotplug.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/memory_hotplug.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history