Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6
Herbert Xu [Wed, 26 May 2010 01:36:58 +0000 (11:36 +1000)]

Trivial merge