diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:29:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:29:00 +0200 |
| commit | 4d7127dace8cf4b05eb7c8c8531fc204fbb195f4 (patch) | |
| tree | 754111f5583a34b90babd521bcb68a3cad8a4912 /arch/sh/Makefile | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| parent | Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-... (diff) | |
| download | linux-4d7127dace8cf4b05eb7c8c8531fc204fbb195f4.tar.xz linux-4d7127dace8cf4b05eb7c8c8531fc204fbb195f4.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: Propagate error from tpm_transmit to fix a timeout hang
driver/char/tpm: fix regression causesd by ppi
Diffstat (limited to 'arch/sh/Makefile')
0 files changed, 0 insertions, 0 deletions