summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2011-10-24 14:47:58 +0200
committerDavid Sterba <dsterba@suse.cz>2011-10-24 14:47:58 +0200
commita81d3b1ba2f5faae28ba7a092c7598673fa02ac2 (patch)
tree8301fefcd9f3d45be9d0030456a86bca5b9ff061 /fs/lockd
parentMerge remote-tracking branch 'remotes/josef/for-chris' into btrfs-next-stable (diff)
parentbtrfs: do not allow mounting non-subvolumes via subvol option (diff)
downloadlinux-a81d3b1ba2f5faae28ba7a092c7598673fa02ac2.tar.xz
linux-a81d3b1ba2f5faae28ba7a092c7598673fa02ac2.zip
Merge branch 'hotfixes-20111024/josef/for-chris' into btrfs-next-stable
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions