]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)

Trivial merge