Skip to content
Commit 02c0241b authored by Herbert Xu's avatar Herbert Xu
Browse files

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

Merge crypto to resolve conflict in crypto/Kconfig.
parents da5ffe11 fe6510b5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment