Merge branches 'slab/cleanups' and 'slab/fixes' into for-linus
authorPekka Enberg <penberg@cs.helsinki.fi>
Mon, 14 Sep 2009 17:19:06 +0000 (20:19 +0300)
committerPekka Enberg <penberg@cs.helsinki.fi>
Mon, 14 Sep 2009 17:19:06 +0000 (20:19 +0300)
1  2  3 
include/linux/slub_def.h
mm/slub.c

Simple merge
diff --cc mm/slub.c
Simple merge