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
Showing
- security/selinux/hooks.c 19 additions, 2 deletionssecurity/selinux/hooks.c
- security/selinux/include/av_perm_to_string.h 3 additions, 0 deletionssecurity/selinux/include/av_perm_to_string.h
- security/selinux/include/av_permissions.h 3 additions, 0 deletionssecurity/selinux/include/av_permissions.h
- security/selinux/include/class_to_string.h 1 addition, 0 deletionssecurity/selinux/include/class_to_string.h
- security/selinux/include/flask.h 1 addition, 0 deletionssecurity/selinux/include/flask.h
Loading
Please register or sign in to comment