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

drivers/crypto/nx/nx-aes-ccm.c

drivers/crypto/nx/nx-aes-ctr.c

drivers/crypto/nx/nx-aes-gcm.c

drivers/crypto/nx/nx-aes-xcbc.c

drivers/crypto/nx/nx-sha256.c

drivers/crypto/nx/nx-sha512.c

drivers/crypto/nx/nx.c

drivers/crypto/nx/nx.h