Eric Paris ea77f7a2e8 Merge commit 'v2.6.39' into 20110526 ... Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c		2011-05-26 17:20:14 -04:00
..
include	Merge commit 'v2.6.39' into 20110526	2011-05-26 17:20:14 -04:00
ss	Merge commit 'v2.6.39' into 20110526	2011-05-26 17:20:14 -04:00
.gitignore	SELinux: add .gitignore files for dynamic classes	2009-10-24 09:42:27 +08:00
avc.c	SELINUX: Make selinux cache VFS RCU walks safe	2011-04-25 18:16:32 -07:00
exports.c	secmark: make secmark object handling generic	2010-10-21 10:12:48 +11:00
hooks.c	Merge commit 'v2.6.39' into 20110526	2011-05-26 17:20:14 -04: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
netif.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
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	SELINUX: add /sys/fs/selinux mount point to put selinuxfs	2011-05-11 12:58:09 -04: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