diff options
| author | Linus Torvalds | 2014-05-21 22:40:13 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-05-21 22:40:13 +0200 |
| commit | 11da37b26301be772c289c5406aec347ad140bd6 (patch) | |
| tree | 383d1f644f8cdfb3653ddbd6ecc033ffb8d1107c /fs/nfsd/nfs4acl.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | Btrfs: send, fix incorrect ref access when using extrefs (diff) | |
| download | kernel-qcow2-linux-11da37b26301be772c289c5406aec347ad140bd6.tar.gz kernel-qcow2-linux-11da37b26301be772c289c5406aec347ad140bd6.tar.xz kernel-qcow2-linux-11da37b26301be772c289c5406aec347ad140bd6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull two btrfs fixes from Chris Mason:
"This has two fixes that we've been testing for 3.16, but since both
are safe and fix real bugs, it makes sense to send for 3.15 instead"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: send, fix incorrect ref access when using extrefs
Btrfs: fix EIO on reading file after ioctl clone works on it
Diffstat (limited to 'fs/nfsd/nfs4acl.c')
0 files changed, 0 insertions, 0 deletions