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
..
include	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
ss	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
.gitignore	SELinux: add .gitignore files for dynamic classes	2009-10-24 09:42:27 +08:00
Kconfig	selinux: Deprecate and schedule the removal of the the compat_net functionality	2008-12-31 12:54:11 -05:00
Makefile	selinux: change to new flag variable	2010-10-21 10:12:40 +11:00
avc.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
exports.c	secmark: make secmark object handling generic	2010-10-21 10:12:48 +11:00
hooks.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
netif.c	security,rcu: convert call_rcu(sel_netif_free) to kfree_rcu()	2011-05-07 22:51:05 -07:00
netlabel.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
netlink.c	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
netnode.c	SELinux: silence build warning when !CONFIG_BUG	2011-04-25 10:18:27 -04:00
netport.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nlmsgtab.c	SELinux: define permissions for DCB netlink messages	2010-12-16 12:50:17 -05:00
selinuxfs.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
xfrm.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00