kernel_optimize_test/security
Greg Kroah-Hartman 249f3c4fe4 Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2016-02-14 14:36:04 -08:00
..
apparmor
integrity EVM: Use crypto_memneq() for digest comparisons 2016-02-12 18:36:47 +11:00
keys KEYS: Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set 2016-01-28 10:48:40 +11:00
selinux Merge 4.5-rc4 into tty-next 2016-02-14 14:36:04 -08:00
smack security: let security modules use PTRACE_MODE_* with bitmasks 2016-01-20 17:09:18 -08:00
tomoyo
yama security: let security modules use PTRACE_MODE_* with bitmasks 2016-01-20 17:09:18 -08:00
commoncap.c ptrace: use fsuid, fsgid, effective creds for fs access checks 2016-01-20 17:09:18 -08:00
device_cgroup.c
inode.c wrappers for ->i_mutex access 2016-01-22 18:04:28 -05:00
Kconfig
lsm_audit.c
Makefile
min_addr.c
security.c