Alex Shi b56111f481 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ... Conflicts: arch/arm/Kconfig		2016-08-30 10:27:13 +08:00
..
apparmor	apparmor: fix ref count leak when profile sha1 hash is read	2016-08-16 09:30:49 +02:00
integrity	EVM: Use crypto_memneq() for digest comparisons	2016-02-17 12:31:04 -08:00
keys	KEYS: potential uninitialized variable	2016-07-27 09:47:31 -07:00
selinux	quick selinux support for tracefs	2016-05-19 12:35:13 +05:30
smack	security: let security modules use PTRACE_MODE_* with bitmasks	2016-03-03 15:07:32 -08:00
tomoyo	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
yama	security: let security modules use PTRACE_MODE_* with bitmasks	2016-03-03 15:07:32 -08:00
commoncap.c	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2016-02-29 10:18:54 +08:00
device_cgroup.c	security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition	2015-09-03 18:13:10 -07:00
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
Kconfig	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2016-08-30 10:27:13 +08:00
lsm_audit.c	Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next	2015-08-15 13:29:57 +10:00
Makefile	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
min_addr.c
security.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2015-09-08 12:41:25 -07:00