Merge branch 'slab/rcu' into slab/next
commitc9149556756d56c68451a4a8735c37e7062fd3d7
authorPekka Enberg <penberg@kernel.org>
Fri, 11 Mar 2011 16:10:45 +0000 (11 18:10 +0200)
committerPekka Enberg <penberg@kernel.org>
Fri, 11 Mar 2011 16:10:45 +0000 (11 18:10 +0200)
treea2dae56b22adaa9a23c8f92f30c3b3ad3b610850
parentd71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63
parent5bfe53a77e8a3ffce4a10003c75f464a138e272d
Merge branch 'slab/rcu' into slab/next

Conflicts:
mm/slub.c
mm/slab.c
mm/slub.c