diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-11 15:31:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-11 15:31:52 +0200 |
commit | 4e3c8a1b1c63482403e9d5e3148dee1a711e4b91 (patch) | |
tree | 513410a63a617436c94373fa5cf6273c3a85c47c /drivers/char/rtc.c | |
parent | Merge tag 'regmap-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
parent | crypto: aesni-intel - fix unaligned cbc decrypt for x86-32 (diff) | |
download | linux-4e3c8a1b1c63482403e9d5e3148dee1a711e4b91.tar.xz linux-4e3c8a1b1c63482403e9d5e3148dee1a711e4b91.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes an unaligned fault on x86-32 with aesni-intel and an
RNG failure with atmel-rng (repeated bits)."
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni-intel - fix unaligned cbc decrypt for x86-32
hwrng: atmel-rng - fix race condition leading to repeated bits
Diffstat (limited to 'drivers/char/rtc.c')
0 files changed, 0 insertions, 0 deletions