| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 | [log] [tgz] |
|---|---|---|
| author | Pekka Enberg <penberg@kernel.org> | Fri Mar 11 18:10:45 2011 +0200 |
| committer | Pekka Enberg <penberg@kernel.org> | Fri Mar 11 18:10:45 2011 +0200 |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 [diff] | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d [diff] |
Merge branch 'slab/rcu' into slab/next Conflicts: mm/slub.c