diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2015-07-01 15:12:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2015-07-01 15:12:50 -0700 |
| commit | 8fff77551a9215a725650263e30fa105acca95ab (patch) | |
| tree | e1414a1b6d56e3ac18c715c6a260177db8e5f367 /drivers/sh | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | crypto: aesni - fix failing setkey for rfc4106-gcm-aesni (diff) | |
| download | linux-8fff77551a9215a725650263e30fa105acca95ab.tar.gz linux-8fff77551a9215a725650263e30fa105acca95ab.tar.bz2 linux-8fff77551a9215a725650263e30fa105acca95ab.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the aesni setkey error and removes a couple of unnecessary
NULL checks in the Intel qat driver"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni - fix failing setkey for rfc4106-gcm-aesni
crypto: qat - Deletion of unnecessary checks before two function calls
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions