Merge branches 'slab/align', 'slab/cleanups', 'slab/fixes', 'slab/memhotadd' and...

author Pekka Enberg <penberg@cs.helsinki.fi>

Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)

committer Pekka Enberg <penberg@cs.helsinki.fi>

Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)
author Pekka Enberg <penberg@cs.helsinki.fi>
Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)
committer Pekka Enberg <penberg@cs.helsinki.fi>
Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Pekka Enberg <penberg@cs.helsinki.fi>
	Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)
committer	Pekka Enberg <penberg@cs.helsinki.fi>
	Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)
		1	2	3	4	5	6
mm/slab.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history