You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

James Morris b7b57551bb Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus ... Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c Manually resolve conflicts. Signed-off-by: James Morris <jmorris@namei.org>		14 years ago
..
Kconfig	Smack: Simplified Mandatory Access Control Kernel	17 years ago
Makefile	Smack: Simplified Mandatory Access Control Kernel	17 years ago
smack.h	LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH	14 years ago
smack_access.c	Fix common misspellings	14 years ago
smack_lsm.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	14 years ago
smackfs.c	Fix common misspellings	14 years ago