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

Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <[email protected]>
Ok'd by Casey Schaufler <[email protected]>

Signed-off-by: James Morris <[email protected]>

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

..

Kconfig

…

Makefile

…

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

smack.h

Smack: Transmute labels on specified directories

2010-12-07 14:04:02 -08:00

smackfs.c

Smack: Transmute labels on specified directories

2010-12-07 14:04:02 -08:00