Merge remote-tracking branch 'slab/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 2 Oct 2012 02:50:40 +0000 (12:50 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 2 Oct 2012 02:50:40 +0000 (12:50 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 02:50:40 +0000 (12:50 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 02:50:40 +0000 (12:50 +1000)
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 2 Oct 2012 02:50:40 +0000 (12:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 2 Oct 2012 02:50:40 +0000 (12:50 +1000)
		1	2
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history