]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12636 from mbroz/master
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 30 May 2019 12:27:22 +0000 (14:27 +0200)
committerGitHub <noreply@github.com>
Thu, 30 May 2019 12:27:22 +0000 (14:27 +0200)
Cryptsetup: call crypt_load() once for LUKS and support LUKS2 tokens


Trivial merge