Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

02c0241b

Commit 02c0241b authored 11 years ago by Herbert Xu

Downloads
- Plain Diff

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

Merge crypto to resolve conflict in crypto/Kconfig.

parents da5ffe11 fe6510b5

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/crypto/aesni-intel_asm.S 32 additions, 16 deletions

arch/x86/crypto/aesni-intel_asm.S
arch/x86/crypto/sha256-avx-asm.S 1 addition, 1 deletion

arch/x86/crypto/sha256-avx-asm.S
arch/x86/crypto/sha256-ssse3-asm.S 1 addition, 1 deletion

arch/x86/crypto/sha256-ssse3-asm.S
drivers/crypto/caam/caamalg.c 2 additions, 2 deletions

drivers/crypto/caam/caamalg.c
drivers/crypto/sahara.c 1 addition, 1 deletion

drivers/crypto/sahara.c

with 37 additions and 21 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment