]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/tracing' into for-next
authorPekka Enberg <penberg@kernel.org>
Sat, 29 Sep 2012 07:02:57 +0000 (10:02 +0300)
committerPekka Enberg <penberg@kernel.org>
Sat, 29 Sep 2012 07:02:57 +0000 (10:02 +0300)
1  2 
mm/slab.c

diff --cc mm/slab.c
Simple merge