Merge branch 'slab/urgent' into slab/next

author Pekka Enberg <[email protected]>

Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)

committer Pekka Enberg <[email protected]>

Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
author Pekka Enberg <[email protected]>
Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
committer Pekka Enberg <[email protected]>
Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Pekka Enberg <[email protected]>
	Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
committer	Pekka Enberg <[email protected]>
	Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
		1	2
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history