github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
bbf44583ac
linux/security
History
Huang, Tao bbf44583ac Merge branch 'torvalds/master' 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	arch/arm/include/asm/arm-cci.h
	drivers/android/binder.c
	drivers/android/binder_trace.h
	drivers/block/zram/Kconfig
	drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h
	include/kvm/arm_arch_timer.h
	include/linux/pl320-ipc.h
	include/linux/zsmalloc.h
	include/uapi/linux/android/binder.h
2015-11-11 19:52:00 +08:00
..
apparmor rk: revert to v3.10 2015-11-11 15:57:28 +08:00
integrity rk: revert to v3.10 2015-11-11 15:57:28 +08:00
keys rk: revert to v3.10 2015-11-11 15:57:28 +08:00
optee_linuxdriver OP-TEE: build optee_linuxdriver into kernel 2015-10-22 12:13:58 +08:00
selinux rk: revert to v3.10 2015-11-11 15:57:28 +08:00
smack Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 2015-11-05 15:32:38 -08:00
tlk_driver TrustZone: Add TrustZone Driver 2015-01-07 17:49:49 +08:00
tomoyo LSM: Switch to lists of hooks 2015-05-12 15:00:41 +10:00
yama Adding YAMA hooks also when YAMA is not stacked. 2015-08-04 01:36:18 +10:00
commoncap.c rk: revert to v3.10 2015-11-11 15:57:28 +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 rk: revert to v3.10 2015-11-11 15:57:28 +08:00
lsm_audit.c rk: revert to v3.10 2015-11-11 15:57:28 +08:00
Makefile rk: temp revert rk change 2015-11-11 15:54:30 +08:00
min_addr.c
security.c rk: revert to v3.10 2015-11-11 15:57:28 +08:00