Merge branch 'slab/next' into for-linus
authorPekka Enberg <penberg@kernel.org>
Sun, 20 Mar 2011 16:12:03 +0000 (18:12 +0200)
committerPekka Enberg <penberg@kernel.org>
Sun, 20 Mar 2011 16:12:03 +0000 (18:12 +0200)

Trivial merge