diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-28 20:35:30 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-28 20:35:30 +0200 |
commit | 31dab719fa50cf56d56d3dc25980fecd336f6ca8 (patch) | |
tree | 20254d20758d2410d9caa68fa1786b71a4225875 /mm/page_alloc.c | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
parent | crypto: arm-aes - fix encryption of unaligned data (diff) | |
download | linux-31dab719fa50cf56d56d3dc25980fecd336f6ca8.tar.xz linux-31dab719fa50cf56d56d3dc25980fecd336f6ca8.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull ARM AES crypto fixes from Herbert Xu:
"This push fixes a regression on ARM where odd-sized blocks supplied to
AES may cause crashes"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: arm-aes - fix encryption of unaligned data
crypto: arm64-aes - fix encryption of unaligned data
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions