summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-10-0252-463/+3546
|\
| * Merge tag 'v3.6-rc7' into nextJames Morris2012-09-281226-7967/+12337
| |\
| * \ Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into nextJames Morris2012-09-271-4/+3
| |\ \
| | * | Documentation: Update git repository URL for Smack userland toolsDaniel Wagner2012-09-261-4/+3
| * | | ima: change flags container data typeDmitry Kasatkin2012-09-191-1/+1
| |/ /
| * | Smack: setprocattr memory leak fixCasey Schaufler2012-09-181-12/+2
| * | Smack: implement revoking all rules for a subject labelRafal Krypa2012-09-182-0/+78
| * | Smack: remove task_wait() hook.Casey Schaufler2012-09-181-29/+8
| * | ima: audit log hashesPeter Moody2012-09-136-7/+56
| * | ima: generic IMA action flag handlingDmitry Kasatkin2012-09-134-19/+26
| * | ima: rename ima_must_appraise_or_measureDmitry Kasatkin2012-09-123-4/+4
| * | audit: export audit_log_task_infoPeter Moody2012-09-122-40/+36
| * | tpm: fix tpm_acpi sparse warning on different address spacesKent Yoder2012-09-121-2/+2
| * | Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kerne...James Morris2012-09-1220-149/+668
| |\ \
| | * | ima: digital signature verification supportDmitry Kasatkin2012-09-072-19/+52
| | * | ima: add support for different security.ima data typesMimi Zohar2012-09-073-14/+17
| | * | ima: add ima_inode_setxattr/removexattr function and callsMimi Zohar2012-09-073-0/+80
| | * | ima: add inode_post_setattr callMimi Zohar2012-09-072-0/+12
| | * | ima: replace iint spinblock with rwlock/read_lockDmitry Kasatkin2012-09-071-9/+7
| | * | ima: allocating iint improvementsDmitry Kasatkin2012-09-073-38/+27
| | * | ima: add appraise action keywords and default rulesMimi Zohar2012-09-074-44/+141
| | * | ima: integrity appraisal extensionMimi Zohar2012-09-0713-53/+358
| | * | vfs: move ima_file_free before releasing the fileMimi Zohar2012-09-071-1/+1
| | * | vfs: extend vfs_removexattr lockingMimi Zohar2012-09-071-2/+4
| * | | samples/seccomp: fix 31 bit build on s390Heiko Carstens2012-09-121-8/+16
| |/ /
| * | Yama: handle 32-bit userspace prctlKees Cook2012-09-081-1/+1
| * | security: allow Yama to be unconditionally stackedKees Cook2012-09-054-4/+70
| * | driver/char/tpm: declare internal symbols as staticXiaoyan Zhang2012-09-042-20/+21
| * | driver: add PPI support in tpm driverXiaoyan Zhang2012-08-224-1/+475
| * | Documentation: sysfs for Physical Presence InterfaceXiaoyan Zhang2012-08-221-0/+70
| * | tpm: Do not dereference NULL pointer if acpi_os_map_memory() fails.Jesper Juhl2012-08-221-0/+5
| * | ima: enable the IBM vTPM as the default TPM in the PPC64 caseKent Yoder2012-08-221-0/+1
| * | drivers/char/tpm: Add securityfs support for event logAshley Lai2012-08-224-12/+93
| * | PPC64: Add support for instantiating SML from Open FirmwareAshley Lai2012-08-221-0/+62
| * | drivers/char/tpm: Add new device driver to support IBM vTPMAshley Lai2012-08-225-0/+836
| * | tpm: compile out unused code in the PNP and PM casesKent Yoder2012-08-221-1/+2
| * | tpm: fix double write race and tpm_release free issueKent Yoder2012-08-221-2/+3
| * | hw_random: add support for the TPM chip as a hardware RNG sourceKent Yoder2012-08-223-0/+64
| * | tpm: Move tpm_get_random api into the TPM device driverKent Yoder2012-08-224-48/+92
| * | tpm: modularize event log collectionKent Yoder2012-08-225-142/+182
| * | char/tpm: Add new driver for Infineon I2C TIS TPMPeter Huewe2012-08-223-0/+707
| * | Merge tag 'v3.6-rc2' into nextJames Morris2012-08-178393-251021/+525728
| |\ \
| * | | ptrace: mark __ptrace_may_access() staticTetsuo Handa2012-08-032-3/+2
| * | | samples/seccomp: fix endianness bug in LO_ARG defineHeiko Carstens2012-08-031-5/+10
* | | | Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubiLinus Torvalds2012-10-0217-325/+412
|\ \ \ \
| * | | | UBI: fix trivial typo 'it' => 'is'Brian Norris2012-09-261-1/+1
| * | | | UBI: load after mtd device driversJiang Lu2012-09-261-1/+1
| * | | | UBI: print lessArtem Bityutskiy2012-09-047-56/+42
| * | | | UBI: use pr_ helper instead of printkArtem Bityutskiy2012-09-046-103/+93
| * | | | UBI: comply with coding styleArtem Bityutskiy2012-09-049-113/+101
OpenPOWER on IntegriCloud