diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /security/smack/smack_access.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'security/smack/smack_access.c')
| -rw-r--r-- | security/smack/smack_access.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index 86453db4333d..9637e107f7ea 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c | |||
| @@ -431,7 +431,7 @@ char *smk_import(const char *string, int len) | |||
| 431 | * smack_from_secid - find the Smack label associated with a secid | 431 | * smack_from_secid - find the Smack label associated with a secid |
| 432 | * @secid: an integer that might be associated with a Smack label | 432 | * @secid: an integer that might be associated with a Smack label |
| 433 | * | 433 | * |
| 434 | * Returns a pointer to the appropraite Smack label if there is one, | 434 | * Returns a pointer to the appropriate Smack label if there is one, |
| 435 | * otherwise a pointer to the invalid Smack label. | 435 | * otherwise a pointer to the invalid Smack label. |
| 436 | */ | 436 | */ |
| 437 | char *smack_from_secid(const u32 secid) | 437 | char *smack_from_secid(const u32 secid) |