diff options
| author | J. Bruce Fields | 2015-02-02 17:29:29 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2015-02-02 17:29:29 +0100 |
| commit | a584143b01ce69803116ae8d0a4db382acc728d7 (patch) | |
| tree | 002733709647fa1e17683a9d21dbc23ae99e3d2d /include/linux/nfs4.h | |
| parent | nfsd: factor out a helper to decode nfstime4 values (diff) | |
| parent | locks: update comments that refer to inode->i_flock (diff) | |
| download | kernel-qcow2-linux-a584143b01ce69803116ae8d0a4db382acc728d7.tar.gz kernel-qcow2-linux-a584143b01ce69803116ae8d0a4db382acc728d7.tar.xz kernel-qcow2-linux-a584143b01ce69803116ae8d0a4db382acc728d7.zip | |
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
Christoph's block pnfs patches have some minor dependencies on these
lock patches.
Diffstat (limited to 'include/linux/nfs4.h')
0 files changed, 0 insertions, 0 deletions