tree c0a7e840a98628ce7eff8dc307a3cdcb9cd33d1a
parent 2a1497c3c4e884d6886e13741d0ba1abd2631006
parent 9b2f4cb65f7083cde86553cd56d6c2878e04932a
author Linus Torvalds <torvalds@linux-foundation.org> 1347405257 +0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1347405257 +0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the authenc self-test crash as well as a missing export of
  a symbol used by a module."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: authenc - Fix crash with zero-length assoc data
  crypto/caam: Export gen_split_key symbol for other modules