diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-05 10:59:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-05 10:59:59 +0200 |
| commit | 9e91edcd1b8b7f12c6484a0b17fb45774354e0b6 (patch) | |
| tree | 1205268178891f72aaef7f06a6388f8b410efd02 /drivers/nfc/microread/microread.h | |
| parent | ecf5fc6e9654cd7a268c782a523f072b2f1959f9 (diff) | |
| parent | 8fcd461db7c09337b6d2e22d25eb411123f379e3 (diff) | |
Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields.
* 'for-4.2' of git://linux-nfs.org/~bfields/linux:
nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
nfsd: Fix a file leak on nfsd4_layout_setlease failure
nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem
Diffstat (limited to 'drivers/nfc/microread/microread.h')
0 files changed, 0 insertions, 0 deletions