summaryrefslogtreecommitdiffstats
path: root/fs/openpromfs
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2012-12-18 12:35:44 +0200
committerPekka Enberg <penberg@kernel.org>2012-12-18 12:35:44 +0200
commita304f836a2e6d257c1f918b3431f97ef6b33e02e (patch)
treead1967fbc0c31ede4ca2a2289992fa9893942cc1 /fs/openpromfs
parent29594404d7fe73cd80eaa4ee8c43dcc53970c60e (diff)
parent0d7561c61d76690ed84bd1016acc0fcbff063205 (diff)
downloadlinux-a304f836a2e6d257c1f918b3431f97ef6b33e02e.tar.bz2
Merge branch 'slab/procfs' into slab/for-linus
Diffstat (limited to 'fs/openpromfs')
0 files changed, 0 insertions, 0 deletions