Merge the crypto tree to resolve the conflict between the temporary and long-term fixes in algif_skcipher. |
||
|---|---|---|
| .. | ||
| generic_mpih-add1.c | ||
| generic_mpih-lshift.c | ||
| generic_mpih-mul1.c | ||
| generic_mpih-mul2.c | ||
| generic_mpih-mul3.c | ||
| generic_mpih-rshift.c | ||
| generic_mpih-sub1.c | ||
| longlong.h | ||
| Makefile | ||
| mpi-bit.c | ||
| mpi-cmp.c | ||
| mpi-inline.h | ||
| mpi-internal.h | ||
| mpi-pow.c | ||
| mpicoder.c | ||
| mpih-cmp.c | ||
| mpih-div.c | ||
| mpih-mul.c | ||
| mpiutil.c | ||