tree a49e8e0bdf07a723d4e73fb6e0cca568b919d4db
parent 988faa7312b490c8a9e7fcdca434c6bf3f3af97b
parent dfe97ad30e8c038261663a18b9e04b8b5bc07bea
author Linus Torvalds <torvalds@linux-foundation.org> 1458738759 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1458738759 -0700

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 the following issues:

  API:
   - Fix kzalloc error path crash in ecryptfs added by skcipher
     conversion.  Note the subject of the commit is screwed up and the
     correct subject is actually in the body.

  Drivers:
   - A number of fixes to the marvell cesa hashing code.
   - Remove bogus nested irqsave that clobbers the saved flags in ccp"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: marvell/cesa - forward devm_ioremap_resource() error code
  crypto: marvell/cesa - initialize hash states
  crypto: marvell/cesa - fix memory leak
  crypto: ccp - fix lock acquisition code
  eCryptfs: Use skcipher and shash