Merge branch 'for-4.2' into for-4.3
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Aug 2015 20:16:03 +0000 (16:16 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Aug 2015 20:16:03 +0000 (16:16 -0400)
commit9056fff3d5190617a93a4ae658a2ea7b96772834
treee8de015b5303c44582262f79983bfa31d2de760c
parentc8623999ffddb8f906154b195aa80d2d279d814f
parent8fcd461db7c09337b6d2e22d25eb411123f379e3
Merge branch 'for-4.2' into for-4.3
fs/nfsd/nfs4state.c