diff --git a/[refs] b/[refs] index e4a5213c7a82..10dce1dd978c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 852584157c55c1689bcf3809ea44b79870c3e409 +refs/heads/master: fc9ff9b7e3eaff3f49bc0fbbddfc1416212e888a diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index d9f7ec41ba51..a14c2d4b22cf 100644 --- a/trunk/include/linux/security.h +++ b/trunk/include/linux/security.h @@ -1372,7 +1372,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) * @inode_getsecctx: * Returns a string containing all relavent security context information * - * @inode we wish to set the security context of. + * @inode we wish to get the security context of. * @ctx is a pointer in which to place the allocated security context. * @ctxlen points to the place to put the length of @ctx. * This is the main security structure.