Eric Paris fc582aef7d Merge tag 'v3.12' ...

Linux 3.12

Conflicts:
	fs/exec.c

2013-11-22 18:57:54 -05:00

..

apparmor

apparmor: fix bad lock balance when introspecting policy

2013-10-16 11:54:01 +11:00

integrity

…

keys

…

selinux

Merge tag 'v3.12'

2013-11-22 18:57:54 -05:00

smack

…

tomoyo

…

yama

…

capability.c

…

commoncap.c

…

device_cgroup.c

…

inode.c

…

Kconfig

…

lsm_audit.c

audit: suppress stock memalloc failure warnings since already managed

2013-11-05 11:09:11 -05:00

Makefile

…

min_addr.c

…

security.c

…