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

Browse source

Merge the crypto tree to pull in the qat registration bug fix.

...

This commit is contained in:

Herbert Xu 2015-08-04 20:44:35 +08:00

parent 76bea64c4c 17fb874dee

commit 1d6669fa83

3 changed files with 17 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/char/hw_random/core.c

View file

1

drivers/crypto/ixp4xx_crypto.c

View file

24

drivers/crypto/qat/qat_common/qat_algs.c

View file