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>

2011-05-24 23:20:19 +10:00

..

Kconfig

…

Makefile

…

smack_access.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

smack_lsm.c

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus

2011-05-24 23:20:19 +10:00

smack.h

LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH

2011-04-25 18:14:07 -04:00

smackfs.c

Fix common misspellings

2011-03-31 11:26:23 -03:00