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)
commitf35ea0d4b66b789e0edcea634238e9aa31924516
tree2de32d027b8dab67153d7133f42c732c5d9e0ffe
parentcbf7a75bc58a2458bd6e47476e47819ba3f40b00
parent27b11428b7de097c42f205beabb1764f4365443b
Merge 3.15 bugfixes for 3.16
fs/nfsd/nfs4acl.c
fs/nfsd/nfs4state.c