diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
| commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
| tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /lib/sort.c | |
| parent | x86/entry: Fix #UD vs WARN more (diff) | |
| parent | Merge tag 'erofs-for-5.8-rc3-fixes' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-2c92d787cc9fad57d05c96bd117782183768258a.tar.xz linux-2c92d787cc9fad57d05c96bd117782183768258a.zip | |
Merge branch 'linus' into x86/entry, to resolve conflicts
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/sort.c')
0 files changed, 0 insertions, 0 deletions