diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-22 19:57:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-22 19:57:27 -0700 |
| commit | d942e43b58dc27b36305bcd374a74f7cc15183a3 (patch) | |
| tree | 7295d8f10138b978a2290ea39e5fc26d50b85f7e /drivers/memstick/core | |
| parent | e369fde1af20c7c67acff3bc4a36e451f38ae7d0 (diff) | |
| parent | 3321c07ae5068568cd61ac9f4ba749006a7185c9 (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
Diffstat (limited to 'drivers/memstick/core')
0 files changed, 0 insertions, 0 deletions