]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3920a6 59b69ac)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:29:00 +0000 (11:29 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:29:00 +0000 (11:29 +0900)
commit4d7127dace8cf4b05eb7c8c8531fc204fbb195f4
tree754111f5583a34b90babd521bcb68a3cad8a4912tree | snapshot
parenta3920a6efa158b445b8a39080b463b9b29337425commit | diff
parent59b69ac2bad602d02904d310ee156e47e74d8109commit | diff
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
Linux kernel for KaRo TX COM modules