Huang, Tao f07d7eb591 Merge tag 'lsk-v3.10-15.04-android' ... Conflicts: drivers/base/cpu.c drivers/misc/Kconfig drivers/misc/Makefile		2015-05-05 10:51:31 +08:00
..
apparmor	sched: move no_new_privs into new atomic flags	2014-10-07 16:42:32 -07:00
integrity	evm: check xattr value length and type in evm_inode_setxattr()	2014-11-14 08:47:54 -08:00
keys	KEYS: close race between key lookup and freeing	2015-01-29 17:40:56 -08:00
selinux	Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android	2015-04-17 13:40:43 +08:00
smack	Smack: include magic.h in smackfs.c	2013-04-03 13:13:51 +11:00
tlk_driver	TrustZone: Add TrustZone Driver	2015-01-07 17:49:49 +08: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.	2015-01-13 22:48:51 +00:00
commoncap.c	Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android	2014-09-18 10:49:35 -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	Merge branch develop-3.10 into develop-3.10-next	2015-02-10 16:43:50 +08:00
lsm_audit.c	security: lsm_audit: add ioctl specific auditing	2015-04-13 19:55:16 +00:00
Makefile	TrustZone: Add TrustZone Driver	2015-01-07 17:49:49 +08:00
min_addr.c
security.c	Add security hooks to binder and implement the hooks for SELinux.	2015-01-13 22:48:51 +00:00