Merge branch 'slab/procfs' into slab/next
authorPekka Enberg <penberg@kernel.org>
Wed, 24 Oct 2012 06:43:00 +0000 (09:43 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 24 Oct 2012 06:43:00 +0000 (09:43 +0300)

Trivial merge