Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and...

[karo-tx-linux.git] / fs / nfs_common / nfsacl.c

diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c
index ec0f277be7f5d4162bc4f12f6e84de17025b0935..6940439bd6090a7ad09954b0cbd721ae34538e65 100644 (file)
--- a/fs/nfs_common/nfsacl.c
+++ b/fs/nfs_common/nfsacl.c
@@ -173,7 +173,7 @@ xdr_nfsace_decode(struct xdr_array2_desc *desc, void *elem)
                                return -EINVAL;
                        break;
                case ACL_MASK:
-                       /* Solaris sometimes sets additonal bits in the mask */
+                       /* Solaris sometimes sets additional bits in the mask */
                        entry->e_perm &= S_IRWXO;
                        break;
                default: