Merge branches 'slab/next' and 'slub/partial' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Wed, 26 Oct 2011 15:09:12 +0000 (18:09 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 26 Oct 2011 15:09:12 +0000 (18:09 +0300)

Trivial merge