summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-01 15:12:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-01 15:12:50 -0700
commit8fff77551a9215a725650263e30fa105acca95ab (patch)
treee1414a1b6d56e3ac18c715c6a260177db8e5f367 /drivers/sh
parent47ebed96ff4ff0d9c39d0fea74ade65dbf9cc41c (diff)
parent0fbafd06bdde938884f7326548d3df812b267c3c (diff)
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