Huang, Tao 220ae60186 Merge branch develop-3.10 into develop-3.10-next ...

Conflicts:
	drivers/clk/rockchip/clk-ops.h
	drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
	drivers/video/rockchip/rk_fb.c

2015-02-10 16:43:50 +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: Fix stale key registration at error path

2015-01-08 09:58:16 -08:00

selinux

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

2014-11-14 18:07:40 +00: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.

2013-07-01 14:16:21 -07: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

LSM: BUILD_BUG_ON if the common_audit_data union ever grows

2012-04-09 12:23:03 -04: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.

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