Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jan 2014 19:35:27 +0000 (11:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jan 2014 19:35:27 +0000 (11:35 -0800)
commit6c72139fb1268813b4fdf53a9aba0166f38d92cc
tree249f4db883e2b2d20a5e70803a85fc22b093b91e
parent6b8c982d415f1fd0740b52cd42c80dbbfccdbf60
parentefb753b8e0136fe66b507e8e1e42b5a2df7ba44d
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