| commit | e8c500c2b64b6e237e67ecba7249e72363c47047 | [log] [tgz] |
|---|---|---|
| author | Pekka Enberg <penberg@kernel.org> | Sun Mar 20 18:13:26 2011 +0200 |
| committer | Pekka Enberg <penberg@kernel.org> | Sun Mar 20 18:13:26 2011 +0200 |
| tree | e9c62e59a879ebef45b0fc2823d318b2fb2fed84 | |
| parent | c53badd0801728feedfcccae04239410b52b0d03 [diff] | |
| parent | a24c5a0ea902bcda348f086bd909cc2d6e305bf8 [diff] |
Merge branch 'slub/lockless' into for-linus Conflicts: include/linux/slub_def.h