summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-07-0340-610/+985
|\
| * tpm/tpm_i2c_infineon: Remove unused header filePeter Huewe2013-06-281-1/+0
| * tpm: tpm_i2c_infinion: Don't modify i2c_client->driverLars-Peter Clausen2013-06-281-3/+0
| * evm: audit integrity metadata failuresMimi Zohar2013-06-201-1/+14
| * integrity: move integrity_audit_msg()Mimi Zohar2013-06-208-38/+41
| * evm: calculate HMAC after initializing posix acl on tmpfsMimi Zohar2013-06-201-8/+8
| * maintainers: add Dmitry KasatkinMimi Zohar2013-06-201-0/+1
| * Merge branch 'smack-for-3.11' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-06-114-280/+610
| |\
| | * Smack: Fix the bug smackcipso can't set CIPSO correctlyPassion,Zhao2013-06-031-1/+1
| | * Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()Tetsuo Handa2013-05-281-0/+2
| | * Smack: Add smkfstransmute mount optionCasey Schaufler2013-05-282-5/+21
| | * Smack: Improve access check performanceCasey Schaufler2013-05-284-249/+282
| | * Smack: Local IPv6 port based controlsCasey Schaufler2013-05-282-40/+319
| * | tpm: fix regression caused by section type conflict of tpm_dev_release() in p...Peter Huewe2013-05-272-1/+2
| * | maintainers: Remove Kent from maintainersKent Yoder2013-05-231-2/+4
| * | tpm: move TPM_DIGEST_SIZE defintionMimi Zohar2013-05-212-1/+2
| * | tpm_tis: missing platform_driver_unregister() on error in init_tis()Wei Yongjun2013-05-211-5/+12
| |/
| * security: clarify cap_inode_getsecctx descriptionJ. Bruce Fields2013-05-121-1/+2
| * apparmor: no need to delay vfree()Al Viro2013-05-121-21/+3
| * Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux...James Morris2013-05-1219-248/+286
| |\
| | * apparmor: fix fully qualified name parsingJohn Johansen2013-04-281-2/+4
| | * apparmor: fix setprocattr arg processing for onexecJohn Johansen2013-04-281-16/+21
| | * apparmor: localize getting the security context to a few macrosJohn Johansen2013-04-284-21/+24
| | * apparmor: fix sparse warningsJohn Johansen2013-04-282-11/+11
| | * apparmor: Fix smatch warning in aa_remove_profilesJohn Johansen2013-04-281-8/+6
| | * apparmor: fix the audit type tableJohn Johansen2013-04-281-1/+1
| | * apparmor: reserve and mask off the top 8 bits of the base fieldJohn Johansen2013-04-281-7/+9
| | * apparmor: move the free_profile fn ahead of aa_alloc_profileJohn Johansen2013-04-281-75/+75
| | * apparmor: remove sid from profilesJohn Johansen2013-04-284-21/+11
| | * apparmor: move perm defines into policy_unpackJohn Johansen2013-04-282-2/+3
| | * apparmor: misc cleanup of matchJohn Johansen2013-04-282-8/+14
| | * apparmor: relax the restrictions on setting rlimitsJohn Johansen2013-04-281-3/+12
| | * apparmor: remove "permipc" commandJohn Johansen2013-04-283-9/+0
| | * apparmor: use common fn to clear task_context for domain transitionsJohn Johansen2013-04-283-16/+20
| | * apparmor: add kvzalloc to handle zeroing for kvmallocJohn Johansen2013-04-283-8/+22
| | * apparmor: add utility function to get an arbitrary tasks profile.John Johansen2013-04-284-32/+49
| | * apparmor: fix error code to failure message mapping for name lookupJohn Johansen2013-04-281-1/+1
| | * apparmor: refactor profile mode macrosJohn Johansen2013-04-281-6/+6
| | * apparmor: Remove -W1 warningsJohn Johansen2013-04-282-6/+0
| | * apparmor: fix auditing of domain transition failures due to incomplete policyJohn Johansen2013-04-281-0/+2
* | | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2013-07-0362-807/+1382
|\ \ \
| * | | KVM: PPC: Ignore PIR writesAlexander Graf2013-06-301-0/+3
| * | | KVM: PPC: Book3S PR: Invalidate SLB entries properlyPaul Mackerras2013-06-301-1/+6
| * | | KVM: PPC: Book3S PR: Allow guest to use 1TB segmentsPaul Mackerras2013-06-304-20/+66
| * | | KVM: PPC: Book3S PR: Don't keep scanning HPTEG after we find a matchPaul Mackerras2013-06-301-12/+2
| * | | KVM: PPC: Book3S PR: Fix invalidation of SLB entry 0 on guest entryPaul Mackerras2013-06-301-11/+2
| * | | KVM: PPC: Book3S PR: Fix proto-VSID calculationsPaul Mackerras2013-06-301-2/+2
| * | | KVM: PPC: Guard doorbell exception with CONFIG_PPC_DOORBELLTiejun Chen2013-06-301-1/+1
| * | | Merge git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-3.11 i...Gleb Natapov2013-06-2717-56/+92
| |\ \ \
| | * | | ARM: kvm: don't include drivers/virtio/KconfigArnd Bergmann2013-06-261-2/+0
OpenPOWER on IntegriCloud