James Morris ece13879e7 Merge branch 'master' into next ...

Conflicts:
	security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>

2009-08-20 09:18:42 +10:00

..

include

SELinux: Convert avc_audit to use lsm_audit.h

2009-08-17 08:37:18 +10:00

ss

Merge branch 'master' into next

2009-06-19 08:20:55 +10:00

avc.c

SELinux: Convert avc_audit to use lsm_audit.h

2009-08-17 08:37:18 +10:00

exports.c

CRED: Wrap current->cred and a few other accessors

2008-11-14 10:39:18 +11:00

hooks.c

Merge branch 'master' into next

2009-08-20 09:18:42 +10:00

Kconfig

selinux: Deprecate and schedule the removal of the the compat_net functionality

2008-12-31 12:54:11 -05:00

Makefile

SELinux: Add network port SID cache

2008-04-18 20:26:16 +10:00

netif.c

SELinux fixups needed for preemptable RCU from -rt

2008-04-22 15:37:23 +10:00

netlabel.c

SELinux: Convert avc_audit to use lsm_audit.h

2009-08-17 08:37:18 +10:00

netlink.c

SELinux: netlink.c whitespace, syntax, and static declaraction cleanups

2008-04-21 19:05:05 +10:00

netnode.c

SELinux: keep the code clean formating and syntax

2008-07-14 15:01:36 +10:00

netport.c

SELinux: keep the code clean formating and syntax

2008-07-14 15:01:36 +10:00

nlmsgtab.c

SELinux: define audit permissions for audit tree netlink messages

2009-06-03 07:44:53 +10:00

selinuxfs.c

selinux: remove obsolete read buffer limit from sel_read_bool

2009-05-19 23:56:11 +10:00

xfrm.c

SELinux: Convert avc_audit to use lsm_audit.h

2009-08-17 08:37:18 +10:00