Merge branch 'slab/next' into for-linus
authorPekka Enberg <penberg@kernel.org>
Sun, 9 Jan 2011 09:05:53 +0000 (11:05 +0200)
committerPekka Enberg <penberg@kernel.org>
Sun, 9 Jan 2011 09:05:53 +0000 (11:05 +0200)

Trivial merge