tree 249f4db883e2b2d20a5e70803a85fc22b093b91e
parent 6b8c982d415f1fd0740b52cd42c80dbbfccdbf60
parent efb753b8e0136fe66b507e8e1e42b5a2df7ba44d
author Linus Torvalds <torvalds@linux-foundation.org> 1388604927 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1388604927 -0800

Merge git://git.kernel.org/pub/scm/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