commit | ba418e97732e54f14a683795e612e8b91d4b5134 | [log] [tgz] |
---|---|---|
author | Łukasz Bartosik <ukaszb@google.com> | Wed Apr 13 07:14:15 2022 |
committer | Łukasz Bartosik <ukaszb@google.com> | Wed Apr 13 07:14:15 2022 |
tree | 601cb6173b031b1cc2efc57dc040105cb12d14da | |
parent | c1e26788dd5b337edc9bd34899ad55bd21eed802 [diff] |
Add conflict resolution for tpm-virtio branch for v5.18-rc2 Signed-off-by: Łukasz Bartosik <ukaszb@google.com>