Alex Shi 60d29b4f9b Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android ...

Conflicts:
	include/linux/mm_types.h

2014-01-10 23:56:41 +08:00

..

apparmor

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

integrity

Revert "ima: policy for RAMFS"

2013-11-29 11:11:44 -08:00

keys

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

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

selinux

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-01-10 23:56:41 +08: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

KEYS: Move the key config into security/keys/Kconfig

2012-05-11 10:56:56 +01: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