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

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

Thu, 28 Jul 2011 02:11:56 +0000 (12:11 +1000)

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

Thu, 28 Jul 2011 02:11:56 +0000 (12:11 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 02:11:56 +0000 (12:11 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 02:11:56 +0000 (12:11 +1000)
diff --cc include/linux/page-flags.h
Simple merge
diff --cc mm/slub.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 28 Jul 2011 02:11:56 +0000 (12:11 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 28 Jul 2011 02:11:56 +0000 (12:11 +1000)
		1	2
include/linux/page-flags.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history