diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-03 22:10:18 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-03 22:10:18 +0800 |
| commit | ab387f0af24e661fc1c2f609664ec9ae6618e3f0 (patch) | |
| tree | 6254d174314b1bcce11ce28f1aadf0df93e25d8e /crypto/algapi.c | |
| parent | crypto: vmx - Use skcipher for ctr fallback (diff) | |
| parent | Linux 4.14-rc3 (diff) | |
| download | wireguard-linux-ab387f0af24e661fc1c2f609664ec9ae6618e3f0.tar.xz wireguard-linux-ab387f0af24e661fc1c2f609664ec9ae6618e3f0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge 4.14-rc3 in order to pick up the new timer_setup function.
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions