projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 56291b2 8b18e23)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Sep 2016 18:10:00 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Sep 2016 18:10:00 +0000 (11:10 -0700)
commitbc4dee5aa72723632a1f83fd0d3720066c93b433
treefb0b3b258451a3870a697db73665a805abc5342ftree | snapshot
parent56291b271be032057c782e357ca728b27d89ff70commit | diff
parent8b18e2359aff2ab810aba84cebffc9da07fef78fcommit | diff
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a regression in the cryptd code that breaks certain
  accelerated AED algorithms as well as an older regression in the
  caam driver that breaks IPsec"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix IV loading for authenc (giv)decryption
  crypto: cryptd - Use correct tfm object for AEAD tracking
John Crispins staging tree