summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2015-04-1511-48/+50
|\
| * Kbuild: kallsyms: drop special handling of pre-3.0 GCC symbolsArd Biesheuvel2015-04-071-1/+0
| * Kbuild: kallsyms: ignore veneers emitted by the ARM linkerArd Biesheuvel2015-04-071-9/+21
| * kbuild: ia64: use $(src)/Makefile.gate rather than particular pathMasahiro Yamada2015-04-021-1/+1
| * kbuild: include $(src)/Makefile rather than $(obj)/MakefileMasahiro Yamada2015-04-022-2/+2
| * kbuild: use relative path more to include MakefileMasahiro Yamada2015-04-025-18/+16
| * kbuild: use relative path to include MakefileMasahiro Yamada2015-04-024-4/+4
| * kbuild: do not add $(bounds-file) and $(offsets-file) to targetsMasahiro Yamada2015-04-021-2/+1
| * kbuild: remove warning about "make depend"Masahiro Yamada2015-03-241-6/+0
| * kbuild: Don't reset timestamps in include/generated if not neededMichal Marek2015-03-241-9/+9
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-04-1531-1156/+1953
|\ \
| * | lsm: copy comm before calling audit_log to avoid race in string printingRichard Guy Briggs2015-04-151-6/+9
| * | Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/gi...James Morris2015-04-134-45/+15
| |\ \
| | * | tomoyo: Do not generate empty policy filesMichal Marek2015-04-073-29/+5
| | * | tomoyo: Use if_changed when generating builtin-policy.hMichal Marek2015-04-071-18/+11
| | * | tomoyo: Use bin2c to generate builtin-policy.hMichal Marek2015-04-072-10/+11
| | |/
| * | selinux: increase avtab max bucketsStephen Smalley2015-04-061-1/+1
| * | selinux: Use a better hash function for avtabJohn Brooks2015-04-062-5/+38
| * | selinux: convert avtab hash table to flex_arrayStephen Smalley2015-04-062-13/+22
| * | selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()Paul Moore2015-04-062-12/+4
| * | selinux: remove unnecessary pointer reassignmentJeff Vander Stoep2015-04-061-4/+2
| * | Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into nextJames Morris2015-04-025-69/+307
| |\ \
| | * | Smack: Updates for Smack documentationCasey Schaufler2015-03-311-50/+79
| | * | smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.cPaul Gortmaker2015-03-231-1/+0
| | * | Smack: Allow an unconfined label in bringup modeCasey Schaufler2015-03-234-17/+182
| | * | Smack: getting the Smack security context of keysJosé Bollo2015-03-231-0/+31
| | * | Smack: Assign smack_known_web as default smk_in label for kernel thread's socketMarcin Lis2015-03-231-1/+15
| * | | tpm/st33zp24/spi: Add missing device table for spi phy.Christophe Ricard2015-03-271-0/+7
| * | | tpm/st33zp24: Add proper wait for ordinal duration in case of irq modeChristophe Ricard2015-03-271-1/+11
| * | | tpm/tpm_infineon: Use struct dev_pm_ops for power managementPeter Huewe2015-03-181-25/+9
| * | | MAINTAINERS: Add Jason as designated reviewer for TPMPeter Huewe2015-03-181-0/+1
| * | | tpm: Update KConfig text to include TPM2.0 FIFO chipsPeter Huewe2015-03-181-4/+5
| * | | tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phyChristophe Ricard2015-03-181-0/+34
| * | | tpm/st33zp24/spi: Add st33zp24 spi phyChristophe Ricard2015-03-185-2/+408
| * | | tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)Christophe Ricard2015-03-189-942/+1036
| * | | tpm/tpm_i2c_stm_st33: Replace access to io_lpcpd from struct st33zp24_platfor...Christophe Ricard2015-03-181-7/+11
| * | | tpm: fix: sanitized code paths in tpm_chip_register()Jarkko Sakkinen2015-03-181-24/+42
| * | | tpm: fix call order in tpm-chip.cJarkko Sakkinen2015-03-051-20/+14
| * | | tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_sendjmlatten@linux.vnet.ibm.com2015-03-052-8/+8
| |/ /
| * | Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/li...James Morris2015-03-032-10/+5
| |\ \ | | |/ | |/|
| | * security/yama: Remove unnecessary selects from Kconfig.Stephen Smalley2015-02-271-2/+0
| | * Yama: do not modify global sysctl table entryKees Cook2015-02-271-8/+5
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2015-04-15168-2202/+18223
|\ \ \
| * | | crypto: arm - workaround for building with old binutilsArd Biesheuvel2015-04-131-4/+15
| * | | crypto: arm/sha256 - avoid sha256 code on ARMv7-MArnd Bergmann2015-04-131-0/+1
| * | | crypto: x86/sha512_ssse3 - move SHA-384/512 SSSE3 implementation to base layerArd Biesheuvel2015-04-104-176/+44
| * | | crypto: x86/sha256_ssse3 - move SHA-224/256 SSSE3 implementation to base layerArd Biesheuvel2015-04-104-173/+50
| * | | crypto: x86/sha1_ssse3 - move SHA-1 SSSE3 implementation to base layerArd Biesheuvel2015-04-101-111/+28
| * | | crypto: arm64/sha2-ce - move SHA-224/256 ARMv8 implementation to base layerArd Biesheuvel2015-04-102-193/+63
| * | | crypto: arm64/sha1-ce - move SHA-1 ARMv8 implementation to base layerArd Biesheuvel2015-04-102-125/+59