]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slub/cleanups' into for-next
authorPekka Enberg <penberg@kernel.org>
Sat, 18 Feb 2012 09:06:29 +0000 (11:06 +0200)
committerPekka Enberg <penberg@kernel.org>
Sat, 18 Feb 2012 09:06:29 +0000 (11:06 +0200)
1  2 
include/linux/slub_def.h
mm/slub.c

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