]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/next' into for-next
authorPekka Enberg <penberg@kernel.org>
Tue, 13 Dec 2011 20:20:26 +0000 (22:20 +0200)
committerPekka Enberg <penberg@kernel.org>
Tue, 13 Dec 2011 20:20:26 +0000 (22:20 +0200)
1  2 
mm/slub.c

diff --cc mm/slub.c
Simple merge