]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 02:57:27 +0000 (19:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 02:57:27 +0000 (19:57 -0700)
commit8bb50ee04f2047a526ebda04c15e2f5c524911cc
tree7295d8f10138b978a2290ea39e5fc26d50b85f7e
parentd642f3cbae1bbfd95f49d52926b67c2eccc127f6
parentdf9ed89f4953dcad767de2d8bbaba0665a999fe0
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security

* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security:
  TPM: Zero buffer after copying to userspace
  TPM: Call tpm_transmit with correct size
  TPM: tpm_nsc: Fix a double free of pdev in cleanup_nsc
  TPM: TCG_ATMEL should depend on HAS_IOPORT