linux-stable/security/smack
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
..
Kconfig Smack: Simplified Mandatory Access Control Kernel 2008-02-05 09:44:20 -08:00
Makefile Smack: Simplified Mandatory Access Control Kernel 2008-02-05 09:44:20 -08:00
smack.h Smack: Transmute labels on specified directories 2010-12-07 14:04:02 -08:00
smack_access.c Smack: Transmute labels on specified directories 2010-12-07 14:04:02 -08:00
smack_lsm.c Merge branch 'master' into next 2011-01-10 09:46:24 +11:00
smackfs.c Smack: Transmute labels on specified directories 2010-12-07 14:04:02 -08:00