Merge 3.15 bugfix for 3.16
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 8 May 2014 18:58:42 +0000 (14:58 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 8 May 2014 18:59:06 +0000 (14:59 -0400)
commitdd15073a269a5edcd87fd26d893286324a6cc856
treed130f5693025b697b4de015a60d2eb5691db4917
parent5409e46f1bcf960c651f3fff35f2f25e539655cf
parentaa07c713ecfc0522916f3cd57ac628ea6127c0ec
Merge 3.15 bugfix for 3.16
fs/nfsd/nfs4acl.c