Merge 3.15 bugfixes for 3.16
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 22 May 2014 19:48:11 +0000 (15:48 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 22 May 2014 19:48:15 +0000 (15:48 -0400)
1  2 
fs/nfsd/nfs4acl.c
fs/nfsd/nfs4state.c

Simple merge
Simple merge