tree ad1967fbc0c31ede4ca2a2289992fa9893942cc1
parent 29594404d7fe73cd80eaa4ee8c43dcc53970c60e
parent 0d7561c61d76690ed84bd1016acc0fcbff063205
author Pekka Enberg <penberg@kernel.org> 1355826944 +0200
committer Pekka Enberg <penberg@kernel.org> 1355826944 +0200

Merge branch 'slab/procfs' into slab/for-linus