merge nfs bugfixes into nfsd for-3.19 branch
authorJ. Bruce Fields <bfields@redhat.com>
Wed, 19 Nov 2014 17:06:30 +0000 (12:06 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Wed, 19 Nov 2014 17:06:30 +0000 (12:06 -0500)
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.

1  2 
fs/open.c
include/linux/fs.h

diff --cc fs/open.c
Simple merge
Simple merge