Merge branch 'slab/procfs' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Tue, 18 Dec 2012 10:35:44 +0000 (12:35 +0200)
committerPekka Enberg <penberg@kernel.org>
Tue, 18 Dec 2012 10:35:44 +0000 (12:35 +0200)
commita304f836a2e6d257c1f918b3431f97ef6b33e02e
treead1967fbc0c31ede4ca2a2289992fa9893942cc1
parent29594404d7fe73cd80eaa4ee8c43dcc53970c60e
parent0d7561c61d76690ed84bd1016acc0fcbff063205
Merge branch 'slab/procfs' into slab/for-linus