From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2015 18:21:04 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: firefly_0821_release~176^2~561
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca43444e4342e9ce38202fb1082d38a7afa8f977;p=firefly-linux-kernel-4.4.55.git

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

Pull crypto fix from Herbert Xu:
 "This fixes a boundary condition in the blkcipher SG walking code that
  can lead to a crash when used with the new chacha20 algorithm"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - Copy iv from desc even for 0-len walks
---

ca43444e4342e9ce38202fb1082d38a7afa8f977