diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-16 03:38:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-16 03:38:24 +0200 |
| commit | 3aa20508a6fe386c2a893027ef4c4ef78ee4eac2 (patch) | |
| tree | a19c6347c6411adecc3879211ab66bcf4e1aa1f5 /fs/jfs/namei.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfo... (diff) | |
| parent | Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmd... (diff) | |
| download | linux-3aa20508a6fe386c2a893027ef4c4ef78ee4eac2.tar.xz linux-3aa20508a6fe386c2a893027ef4c4ef78ee4eac2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM bugfixes from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm, tpm_crb: fail when TPM2 ACPI table contents look corrupted
tpm: Fix initialization of the cdev
Diffstat (limited to 'fs/jfs/namei.c')
0 files changed, 0 insertions, 0 deletions