tree d355ee40aa413a22e45df97ac1a3527aa8eacd37
parent 39dae59d66acd86d1de24294bd2f343fd5e7a625
parent 441f99c90497e15aa3ad1dbabd56187e29614348
author Linus Torvalds <torvalds@linux-foundation.org> 1509987903 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1509987903 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes an unaligned panic in x86/sha-mb and a bug in ccm that
  triggers with certain underlying implementations"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ccm - preserve the IV buffer
  crypto: x86/sha1-mb - fix panic due to unaligned access
  crypto: x86/sha256-mb - fix panic due to unaligned access