diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 14:14:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 14:14:58 -0400 |
| commit | 277b5fb35b770792f89fbe50df03daddb3fa9521 (patch) | |
| tree | 1b5558cff414274bbc07d1df6ca7cd743df20c4c /mm/memblock.c | |
| parent | a54769c505db4bdf01d19dca64d15cb303503d71 (diff) | |
| parent | 511d63cb19329235bc9298b64010ec494b5e1408 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Locking fix for talitos driver
- Fix 64-bit counter overflow in SHA-512
- Build fix for ixp4xx.
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: talitos - properly lock access to global talitos registers
crypto: ixp4xx - include fix
crypto: sha512 - Fix byte counter overflow in SHA-512
Diffstat (limited to 'mm/memblock.c')
0 files changed, 0 insertions, 0 deletions