]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b667a89 f512b34)
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)
commit1afb1b9ebe5a0bc18cd1b91d58d365d314f328a7
tree754111f5583a34b90babd521bcb68a3cad8a4912tree | snapshot
parentb667a89ff604a8c741385911767d67215e62c434commit | diff
parentf512b34a4e4ef2f60cc81089cda4d07db2cf796dcommit | 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 Source Tree.