| commit | e90c48efde40f8428777424e6edbbb240b441652 | [log] [tgz] |
|---|---|---|
| author | Herbert Xu <herbert@gondor.apana.org.au> | Tue Aug 22 14:53:32 2017 +0800 |
| committer | Herbert Xu <herbert@gondor.apana.org.au> | Tue Aug 22 14:53:32 2017 +0800 |
| tree | c023a7a8fa0255f03040c63a73068eaaca03f1af | |
| parent | ef4064bb3f6a1037cbda8d025f564aab5bd2de35 [diff] | |
| parent | 445a582738de6802669aeed9c33ca406c23c3b1f [diff] |
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.