projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e369fde 3321c07)
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)
commitd942e43b58dc27b36305bcd374a74f7cc15183a3
tree7295d8f10138b978a2290ea39e5fc26d50b85f7etree | snapshot
parente369fde1af20c7c67acff3bc4a36e451f38ae7d0commit | diff
parent3321c07ae5068568cd61ac9f4ba749006a7185c9commit | diff
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
John Crispins staging tree