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

0f95e2ff · Herbert Xu <[email protected]> · 2016-07-22 18:00:05 +08:00

Merge the crypto tree to resolve conflict in rsa-pkcs1pad.

Commit

0f95e2ffc58f5d32a90eb1051d17aeebc21cf91d

Parents

51b259bb · 87dcdebd

Merge commit. Changes below are compared with the first parent: 51b259bb.

Changes

0 files changed · +0 −0

No file changes.