From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jan 2014 19:35:27 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: firefly_0821_release~176^2~4708
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6c72139fb1268813b4fdf53a9aba0166f38d92cc;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "Fix a build error on ARM that was introduced in 3.13-rc1"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ixp4xx - Fix kernel compile error
---

6c72139fb1268813b4fdf53a9aba0166f38d92cc