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


Trivial merge