Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2015 00:16:49 +0000 (17:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2015 00:16:49 +0000 (17:16 -0700)
commite51a3630565f61a5151f24f9ece191277ddaa320
treeb66b46a021aeab28e41197620ea7e42481431b99
parent3d854120e97b87c04f3a4b0e272d61acedb144c7
parent7b2a18e05feb86f9be25602abfa9604a6b977f79
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a the crash in the newly added algif_aead interface when it
  tries to link SG lists"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_aead - fix invalid sgl linking