Merge branch 'slab/next' into for-linus
authorPekka Enberg <penberg@kernel.org>
Mon, 23 May 2011 16:50:39 +0000 (19:50 +0300)
committerPekka Enberg <penberg@kernel.org>
Mon, 23 May 2011 16:50:39 +0000 (19:50 +0300)
Conflicts:
mm/slub.c


Trivial merge