Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up hisilicon patch.
Showing
- arch/arm/crypto/curve25519-glue.c 7 additions, 0 deletionsarch/arm/crypto/curve25519-glue.c
- drivers/crypto/hisilicon/sec2/sec.h 3 additions, 3 deletionsdrivers/crypto/hisilicon/sec2/sec.h
- drivers/crypto/hisilicon/sec2/sec_crypto.c 6 additions, 6 deletionsdrivers/crypto/hisilicon/sec2/sec_crypto.c
- drivers/crypto/hisilicon/sec2/sec_main.c 12 additions, 2 deletionsdrivers/crypto/hisilicon/sec2/sec_main.c
Please register or sign in to comment