Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Oct 2015 22:20:10 +0000 (07:20 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Oct 2015 22:20:10 +0000 (07:20 +0900)
Pull crypto fix from Herbert Xu:
 "This fixes a problem in the Crypto API that may cause spurious errors
  when signals are received by the process that made the orignal system
  call into the kernel"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: api - Only abort operations on fatal signal


Trivial merge