Merge branch 'slab/urgent' into slab/next
authorPekka Enberg <penberg@kernel.org>
Fri, 11 Mar 2011 16:11:19 +0000 (18:11 +0200)
committerPekka Enberg <penberg@kernel.org>
Fri, 11 Mar 2011 16:11:19 +0000 (18:11 +0200)
1  2 
mm/slab.c

diff --cc mm/slab.c
Simple merge