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)
commite8c500c2b64b6e237e67ecba7249e72363c47047
treee9c62e59a879ebef45b0fc2823d318b2fb2fed84
parentc53badd0801728feedfcccae04239410b52b0d03
parenta24c5a0ea902bcda348f086bd909cc2d6e305bf8
Merge branch 'slub/lockless' into for-linus

Conflicts:
include/linux/slub_def.h
include/linux/slub_def.h
mm/slub.c