]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slub/lockless' into for-next
authorPekka Enberg <penberg@kernel.org>
Mon, 18 Jul 2011 12:17:46 +0000 (15:17 +0300)
committerPekka Enberg <penberg@kernel.org>
Mon, 18 Jul 2011 12:17:46 +0000 (15:17 +0300)
1  2 
mm/slub.c

diff --cc mm/slub.c
Simple merge