diff options
author | 2012-04-20 11:14:58 -0700 | |
---|---|---|
committer | 2012-04-20 11:14:58 -0700 | |
commit | 277b5fb35b770792f89fbe50df03daddb3fa9521 (patch) | |
tree | 1b5558cff414274bbc07d1df6ca7cd743df20c4c /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
parent | crypto: talitos - properly lock access to global talitos registers (diff) | |
download | wireguard-linux-277b5fb35b770792f89fbe50df03daddb3fa9521.tar.xz wireguard-linux-277b5fb35b770792f89fbe50df03daddb3fa9521.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 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions