Linus Torvalds 95b6886526 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (54 commits) tpm_nsc: Fix bug when loading multiple TPM drivers tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block tpm: Fix compilation warning when CONFIG_PNP is not defined TOMOYO: Update kernel-doc. tpm: Fix a typo tpm_tis: Probing function for Intel iTPM bug tpm_tis: Fix the probing for interrupts tpm_tis: Delay ACPI S3 suspend while the TPM is busy tpm_tis: Re-enable interrupts upon (S3) resume tpm: Fix display of data in pubek sysfs entry tpm_tis: Add timeouts sysfs entry tpm: Adjust interface timeouts if they are too small tpm: Use interface timeouts returned from the TPM tpm_tis: Introduce durations sysfs entry tpm: Adjust the durations if they are too small tpm: Use durations returned from TPM TOMOYO: Enable conditional ACL. TOMOYO: Allow using argv[]/envp[] of execve() as conditions. TOMOYO: Allow using executable's realpath and symlink's target as conditions. TOMOYO: Allow using owner/group etc. of file objects as conditions. ... Fix up trivial conflict in security/tomoyo/realpath.c		2011-07-27 19:26:38 -07:00
..
include
.gitignore
apparmorfs.c
audit.c
capability.c
context.c
domain.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-07-27 19:26:38 -07:00
file.c
ipc.c
Kconfig
lib.c	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
lsm.c	AppArmor: Fix masking of capabilities in complain mode	2011-06-29 02:04:44 +01:00
Makefile	AppArmor: cleanup generated files correctly	2011-03-08 17:03:53 -08:00
match.c	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
path.c
policy_unpack.c	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
policy.c
procattr.c
resource.c
sid.c