| commit | 2c92d787cc9fad57d05c96bd117782183768258a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Jun 26 12:24:42 2020 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Jun 26 12:24:42 2020 +0200 |
| tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 | |
| parent | 145a773aef83181d47ebab21bb33c89233aadb1e [diff] | |
| parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 [diff] |
Merge branch 'linus' into x86/entry, to resolve conflicts Conflicts: arch/x86/kernel/traps.c Signed-off-by: Ingo Molnar <mingo@kernel.org>