From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2015 00:16:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: firefly_0821_release~176^2~1750
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e51a3630565f61a5151f24f9ece191277ddaa320;p=firefly-linux-kernel-4.4.55.git

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
---

e51a3630565f61a5151f24f9ece191277ddaa320