| commit | f0a1064966a73512b1229914f66dccb9a276358e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Oct 23 09:56:40 2023 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Oct 23 10:00:21 2023 +0200 |
| tree | 56d41bd38c25c51f984a81cfc14818dbbd554684 | |
| parent | 4d8b8c94ec9033403f7f25147ba9b1f374bd6757 [diff] | |
| parent | 50dcc2e0d62e3c4a54f39673c4dc3dcde7c74d52 [diff] |
Merge branch 'x86/boot' into x86/merge, to ease integration testing Conflicts: drivers/firmware/efi/libstub/x86-stub.c Signed-off-by: Ingo Molnar <mingo@kernel.org>