| commit | e8c500c2b64b6e237e67ecba7249e72363c47047 | |
| author | Pekka Enberg <penberg@kernel.org> | |
| Sun, 20 Mar 2011 16:13:26 +0000 (20 18:13 +0200) | ||
| committer | Pekka Enberg <penberg@kernel.org> | |
| Sun, 20 Mar 2011 16:13:26 +0000 (20 18:13 +0200) | ||
| tree | e9c62e59a879ebef45b0fc2823d318b2fb2fed84 | treesnapshot (tar.gz zip) |
| parent | c53badd0801728feedfcccae04239410b52b0d03 | commitdiff |
| parent | a24c5a0ea902bcda348f086bd909cc2d6e305bf8 | commitdiff |
Merge branch 'slub/lockless' into for-linus
Conflicts:
include/linux/slub_def.h
Conflicts:
include/linux/slub_def.h
| include/linux/slub_def.h | diff1 | diff2 | blobhistory |
| mm/slub.c | diff1 | diff2 | blobhistory |