This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Eric Paris ea77f7a2e8 Merge commit 'v2.6.39' into 20110526 ...

Conflicts:
	lib/flex_array.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/ss/policydb.c
	security/smack/smack_lsm.c

2011-05-26 17:20:14 -04:00

..

apparmor

Fix common misspellings

2011-03-31 11:26:23 -03:00

integrity/ima

ima: remove unnecessary call to ima_must_measure

2011-02-23 16:38:52 -05:00

keys

KEYS: Add an iovec version of KEYCTL_INSTANTIATE

2011-03-08 11:17:22 +11:00

selinux

Merge commit 'v2.6.39' into 20110526

2011-05-26 17:20:14 -04:00

smack

Merge commit 'v2.6.39' into 20110526

2011-05-26 17:20:14 -04:00

tomoyo

Fix common misspellings

2011-03-31 11:26:23 -03:00

capability.c

SECURITY: Move exec_permission RCU checks into security modules

2011-04-25 10:20:32 -04:00

commoncap.c

userns: allow ptrace from non-init user namespaces

2011-03-23 19:47:05 -07:00

device_cgroup.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

inode.c

convert get_sb_single() users

2010-10-29 04:16:28 -04:00

Kconfig

keys: add new key-type encrypted

2010-11-29 08:55:29 +11:00

lsm_audit.c

LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH

2011-04-25 18:14:07 -04:00

Makefile

AppArmor: Enable configuring and building of the AppArmor security module

2010-08-02 15:38:34 +10:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

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

security.c

SECURITY: Move exec_permission RCU checks into security modules

2011-04-25 10:20:32 -04:00