diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 09:21:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 09:21:26 -0800 |
| commit | 0faa90880331386ac86ca78d52692c7a94051eab (patch) | |
| tree | 7cb9311c118a2e766ae378a433421130bac32e8c /security/selinux/include/class_to_string.h | |
| parent | 1f07e988290fc45932f5028c9e2a862c37a57336 (diff) | |
| parent | b68e418c445e8a468634d0a7ca2fb63bbaa74028 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
selinux: support 64-bit capabilities
Diffstat (limited to 'security/selinux/include/class_to_string.h')
| -rw-r--r-- | security/selinux/include/class_to_string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/include/class_to_string.h b/security/selinux/include/class_to_string.h index b1b0d1d8f950..bd813c366e34 100644 --- a/security/selinux/include/class_to_string.h +++ b/security/selinux/include/class_to_string.h @@ -71,3 +71,4 @@ S_(NULL) S_(NULL) S_("peer") + S_("capability2") |