diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-30 16:33:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-30 16:33:22 -0500 |
commit | c462f16b1a319991c59747e65837924a5ff17755 (patch) | |
tree | 67423e1295a1d7c7b7183c9279d75ba2852a4bde /security | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
parent | crypto: inside-secure - do not use memset on MMIO (diff) | |
download | linux-dev-c462f16b1a319991c59747e65837924a5ff17755.tar.xz linux-dev-c462f16b1a319991c59747e65837924a5ff17755.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a potential kernel panic in the inside-secure driver"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: inside-secure - do not use memset on MMIO
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions