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

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

Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.
parents ef4064bb 445a5827
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment