tree a2dae56b22adaa9a23c8f92f30c3b3ad3b610850
parent d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63
parent 5bfe53a77e8a3ffce4a10003c75f464a138e272d
author Pekka Enberg <penberg@kernel.org> 1299859845 +0200
committer Pekka Enberg <penberg@kernel.org> 1299859845 +0200

Merge branch 'slab/rcu' into slab/next

Conflicts:
	mm/slub.c