diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 11:14:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 11:14:58 -0700 |
| commit | acdc6cb9a4bec57e322dacb623758765d85e7324 (patch) | |
| tree | 1ab9c9edabc9cd5ac70d0832b2ca536be3e0bafc /crypto/camellia_generic.c | |
| parent | 30eb376a612bcb8c6e959fbd541556021d9be6b3 (diff) | |
| parent | c93a811cd67a1ee2a3cd189a9a27d95199fcb8ee (diff) | |
| download | linux-crypto-acdc6cb9a4bec57e322dacb623758765d85e7324.tar.gz linux-crypto-acdc6cb9a4bec57e322dacb623758765d85e7324.zip | |
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 'crypto/camellia_generic.c')
0 files changed, 0 insertions, 0 deletions