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

Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

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

2011-01-10 09:46:24 +11:00

..

include

security: Define CAP_SYSLOG

2010-11-29 08:35:12 +11:00

ss

selinux: include vmalloc.h for vmalloc_user

2010-10-21 10:13:01 +11:00

.gitignore

SELinux: add .gitignore files for dynamic classes

2009-10-24 09:42:27 +08:00

avc.c

SELinux: special dontaudit for access checks

2010-08-02 15:35:07 +10:00

exports.c

secmark: make secmark object handling generic

2010-10-21 10:12:48 +11:00

hooks.c

af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.

2011-01-05 15:38:53 -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

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

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

netlink.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

netnode.c

selinux: remove all rcu head initializations

2010-08-02 15:33:35 +10: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: Remove unused headers skbuff.h in selinux/nlmsgtab.c

2010-03-04 08:51:06 +11:00

selinuxfs.c

fs: dcache rationalise dget variants

2011-01-07 17:50:24 +11:00

xfrm.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