tree 69e65f504b0a0f73d21a28b37ea076b84549156f
parent 4f440cd534359f689cb577c68f8491d1eddf0b76
parent 0378c9a855bfa395f595fbfb049707093e270f69
author Linus Torvalds <torvalds@linux-foundation.org> 1405017057 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1405017057 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This push fixes an error in sha512_ssse3 that leads to incorrect
  output as well as a memory leak in caam_jr when the module is
  unloaded"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix memleak in caam_jr module
  crypto: sha512_ssse3 - fix byte count to bit count conversion