summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-07-2736-2839/+6483
|\
| * tpm_nsc: Fix bug when loading multiple TPM driversStefan Berger2011-07-261-7/+7
| * tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP blockStefan Berger2011-07-221-22/+23
| * tpm: Fix compilation warning when CONFIG_PNP is not definedStefan Berger2011-07-211-6/+1
| * TOMOYO: Update kernel-doc.Tetsuo Handa2011-07-1413-62/+269
| * tpm: Fix a typoStefan Berger2011-07-121-1/+1
| * tpm_tis: Probing function for Intel iTPM bugStefan Berger2011-07-121-4/+73
| * tpm_tis: Fix the probing for interruptsStefan Berger2011-07-122-6/+28
| * tpm_tis: Delay ACPI S3 suspend while the TPM is busyStefan Berger2011-07-121-5/+23
| * tpm_tis: Re-enable interrupts upon (S3) resumeStefan Berger2011-07-121-0/+30
| * tpm: Fix display of data in pubek sysfs entryStefan Berger2011-07-121-10/+16
| * tpm_tis: Add timeouts sysfs entryStefan Berger2011-07-123-1/+22
| * tpm: Adjust interface timeouts if they are too smallStefan Berger2011-07-121-4/+9
| * tpm: Use interface timeouts returned from the TPMStefan Berger2011-07-121-3/+4
| * tpm_tis: Introduce durations sysfs entryStefan Berger2011-07-123-1/+21
| * tpm: Adjust the durations if they are too smallStefan Berger2011-07-121-6/+11
| * tpm: Use durations returned from TPMStefan Berger2011-07-121-2/+4
| * TOMOYO: Enable conditional ACL.Tetsuo Handa2011-07-115-33/+80
| * TOMOYO: Allow using argv[]/envp[] of execve() as conditions.Tetsuo Handa2011-07-116-10/+589
| * TOMOYO: Allow using executable's realpath and symlink's target as conditions.Tetsuo Handa2011-07-115-4/+228
| * TOMOYO: Allow using owner/group etc. of file objects as conditions.Tetsuo Handa2011-07-114-0/+457
| * TOMOYO: Allow using UID/GID etc. of current thread as conditions.Tetsuo Handa2011-07-118-37/+651
| * TOMOYO: Remove /sys/kernel/security/tomoyo/.domain_status interface.Tetsuo Handa2011-07-083-76/+0
| * TOMOYO: Fix wrong domainname in tomoyo_init_log().Tetsuo Handa2011-07-011-1/+1
| * encrypted-keys: move ecryptfs documentation to proper locationMimi Zohar2011-06-301-0/+0
| * TOMOYO: Cleanup header file.Tetsuo Handa2011-06-301-117/+96
| * TOMOYO: Update MAINTAINERS file.Tetsuo Handa2011-06-301-1/+1
| * TOMOYO: Fix build error with CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y .Tetsuo Handa2011-06-301-0/+2
| * Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/...James Morris2011-06-302-2/+2
| |\
| | * AppArmor: Fix masking of capabilities in complain modeJohn Johansen2011-06-291-1/+1
| | * AppArmor: Fix reference to rcu protected pointer outside of rcu_read_lockJohn Johansen2011-06-291-1/+1
| * | Merge branch 'linus' into nextJames Morris2011-06-30813-4643/+10195
| |\ \
| * | | TOMOYO: Make several options configurable.Tetsuo Handa2011-06-293-23/+117
| * | | TOMOYO: Add built-in policy support.Tetsuo Handa2011-06-294-10/+108
| * | | TOMOYO: Rename meminfo to stat and show more statistics.Tetsuo Handa2011-06-296-143/+206
| * | | TOMOYO: Cleanup part 4.Tetsuo Handa2011-06-296-121/+177
| * | | TOMOYO: Fix lockdep warning.Tetsuo Handa2011-06-293-51/+276
| * | | TOMOYO: Change pathname for non-rename()able filesystems.Tetsuo Handa2011-06-292-54/+180
| * | | TOMOYO: Add policy namespace support.Tetsuo Handa2011-06-298-299/+669
| * | | TOMOYO: Add ACL group support.Tetsuo Handa2011-06-295-11/+88
| * | | TOMOYO: Add auditing interface.Tetsuo Handa2011-06-299-235/+557
| * | | TOMOYO: Simplify profile structure.Tetsuo Handa2011-06-293-168/+83
| * | | TOMOYO: Rename directives.Tetsuo Handa2011-06-294-59/+113
| * | | TOMOYO: Use struct for passing ACL line.Tetsuo Handa2011-06-298-371/+347
| * | | TOMOYO: Cleanup part 3.Tetsuo Handa2011-06-299-153/+410
| * | | TOMOYO: Cleanup part 2.Tetsuo Handa2011-06-295-359/+204
| * | | TOMOYO: Cleanup part 1.Tetsuo Handa2011-06-298-535/+71
| * | | eCryptfs: added support for the encrypted key typeRoberto Sassu2011-06-272-7/+47
| * | | encrypted-keys: add ecryptfs format supportRoberto Sassu2011-06-276-10/+252
| * | | eCryptfs: export global eCryptfs definitions to include/linux/ecryptfs.hRoberto Sassu2011-06-272-108/+114
OpenPOWER on IntegriCloud