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

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

Thu, 12 Sep 2013 01:35:07 +0000 (11:35 +1000)

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

Thu, 12 Sep 2013 01:35:07 +0000 (11:35 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:35:07 +0000 (11:35 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:35:07 +0000 (11:35 +1000)
diff --cc init/Kconfig
Simple merge
diff --cc mm/slub.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Sep 2013 01:35:07 +0000 (11:35 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Sep 2013 01:35:07 +0000 (11:35 +1000)
		1	2
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history