Merge branches 'slab/align', 'slab/cleanups', 'slab/fixes', 'slab/memhotadd' and...
Pekka Enberg [Sat, 22 May 2010 07:57:52 +0000 (10:57 +0300)]
1  2  3  4  5  6 
mm/slab.c
mm/slub.c

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