tree 3445d4ea3d11415cf570e56d5dbd74c5578836de
parent c8fff3ed321abf11bea7464884b0876c46ff2491
parent 4afa5f9617927453ac04b24b584f6c718dfb4f45
author Linus Torvalds <torvalds@linux-foundation.org> 1447262587 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1447262587 -0800

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

Pull crypto fix from Herbert Xu:
 "This fixes a bug in the algif_hash interface that may lead to crashes
  when used with certain algorithms such as HMAC"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_hash - Only export and import on sockets with data