Eric Paris b7d3622a39 Merge tag 'v3.13' into for-3.15 ...

Linux 3.13

Conflicts:
	include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.

2014-03-07 11:41:32 -05:00

..

Kconfig

Smack: use select not depends in Kconfig

2012-12-14 10:57:10 -08:00

Makefile

…

smack_access.c

Smack: Implement lock security mode

2013-10-18 09:39:33 -07:00

smack_lsm.c

Merge tag 'v3.13' into for-3.15

2014-03-07 11:41:32 -05:00

smack.h

Smack: Implement lock security mode

2013-10-18 09:39:33 -07:00

smackfs.c

Smack: Implement lock security mode

2013-10-18 09:39:33 -07:00