]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jul 2015 22:12:50 +0000 (15:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jul 2015 22:12:50 +0000 (15:12 -0700)
commitf91bff7fdd78ecc96e07dfc53fc5c5f1125d981e
treee1414a1b6d56e3ac18c715c6a260177db8e5f367
parent6d168fb9fc9f3d07cd37aaad51ce4e5c8493fdfe
parent5c871f4e177ed34e040354b7414d25f41b3c14c0
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