Merge branch 'slab/urgent' into slab/next
authorPekka Enberg <penberg@kernel.org>
Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
committerPekka Enberg <penberg@kernel.org>
Mon, 19 Sep 2011 14:46:07 +0000 (17:46 +0300)
1  2 
mm/slab.c
mm/slub.c

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