commit | 3bf64e8ecd890cf16a9c2ca87c4b65601f4e370f | [log] [tgz] |
---|---|---|
author | Stephen Rothwell <sfr@canb.auug.org.au> | Fri May 20 21:04:22 2022 +1000 |
committer | Stephen Rothwell <sfr@canb.auug.org.au> | Fri May 20 21:04:22 2022 +1000 |
tree | 7a520b7b058d9c0fcf5e7db8cda0163fab206f40 | |
parent | 9590bbcd467eac64dd3b0d0620186e6efebbee22 [diff] | |
parent | 3f68e69520d3d52d66a6ad872a75b7d8f2ea7665 [diff] |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git # Conflicts: # drivers/virt/Kconfig # drivers/virt/Makefile