diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 02:29:00 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 02:29:00 (GMT) |
| commit | 4d7127dace8cf4b05eb7c8c8531fc204fbb195f4 (patch) | |
| tree | 754111f5583a34b90babd521bcb68a3cad8a4912 /fs/xfs | |
| parent | a3920a6efa158b445b8a39080b463b9b29337425 (diff) | |
| parent | 59b69ac2bad602d02904d310ee156e47e74d8109 (diff) | |
| download | linux-4d7127dace8cf4b05eb7c8c8531fc204fbb195f4.tar.xz | |
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: Propagate error from tpm_transmit to fix a timeout hang
driver/char/tpm: fix regression causesd by ppi
Diffstat (limited to 'fs/xfs')
0 files changed, 0 insertions, 0 deletions