Merge branch 'slub/lockless' into for-linus
authorPekka Enberg <penberg@kernel.org>
Sun, 20 Mar 2011 16:13:26 +0000 (18:13 +0200)
committerPekka Enberg <penberg@kernel.org>
Sun, 20 Mar 2011 16:13:26 +0000 (18:13 +0200)
Conflicts:
include/linux/slub_def.h


Trivial merge