Mark Brown bb0dddf615 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android ...

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/crypto/Makefile
	arch/arm64/crypto/aes-glue.c
	arch/arm64/crypto/ghash-ce-core.S
	arch/arm64/crypto/ghash-ce-glue.c
	arch/arm64/include/asm/ptrace.h
	arch/arm64/include/asm/thread_info.h
	arch/arm64/kernel/fpsimd.c
	crypto/ablk_helper.c
	drivers/base/cpu.c
	drivers/hid/hid-core.c
	net/ipv4/raw.c

2014-09-08 12:05:48 +01:00

..

apparmor

nick kvfree() from apparmor

2014-09-03 12:56:24 -07:00

integrity

evm: prohibit userspace writing 'security.evm' HMAC value

2014-06-26 15:12:37 -04:00

keys

aio: don't include aio.h in sched.h

2013-05-07 20:16:25 -07:00

selinux

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

2014-09-08 12:05:48 +01:00

smack

Smack: include magic.h in smackfs.c

2013-04-03 13:13:51 +11:00

tomoyo

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

yama

yama: Better permission check for ptraceme

2013-03-26 13:17:58 -07:00

capability.c

Add security hooks to binder and implement the hooks for SELinux.

2013-07-01 14:16:21 -07:00

commoncap.c

security: Add proper checks for Android specific capability checks

2013-07-01 13:40:45 -07:00

device_cgroup.c

devcg: remove parent_cgroup.

2013-04-18 11:34:35 -07:00

inode.c

securityfs: fix object creation races

2012-01-10 10:20:35 -05:00

Kconfig

security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64

2014-07-22 10:09:56 -07:00

lsm_audit.c

LSM: BUILD_BUG_ON if the common_audit_data union ever grows

2012-04-09 12:23:03 -04:00

Makefile

security: Yama LSM

2012-02-10 09:18:52 +11:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

2010-04-23 08:56:31 +10:00

security.c

Add security hooks to binder and implement the hooks for SELinux.

2013-07-01 14:16:21 -07:00