]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/procfs' into for-next
authorPekka Enberg <penberg@kernel.org>
Wed, 24 Oct 2012 06:41:29 +0000 (09:41 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 24 Oct 2012 06:41:29 +0000 (09:41 +0300)
1  2 
mm/slub.c

diff --cc mm/slub.c
Simple merge