diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-21 00:26:18 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-21 00:26:18 -0700 |
commit | 3d04d42312eacc68fbcddea337f7eb34bc035dfb (patch) | |
tree | 7211df5704b743a7667159748c670a9744164482 /include/linux/security.h | |
parent | c98291ee1ceac03912e24b3219fa6e7dc0d52f5e (diff) | |
parent | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 83c18e8c846d..c8949385e56e 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -812,7 +812,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) * Check permissions before connecting or sending datagrams from @sock to * @other. * @sock contains the socket structure. - * @sock contains the peer socket structure. + * @other contains the peer socket structure. * Return 0 if permission is granted. * * The @unix_stream_connect and @unix_may_send hooks were necessary because |