]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into x86/entry, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Fri, 26 Jun 2020 10:24:42 +0000 (12:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 26 Jun 2020 10:24:42 +0000 (12:24 +0200)
commitedb877bb6629e16255e1d045573ff55e3605d584
tree51c0c567b8be2fd56073a8ce31f8ebd123a7d562
parentf2d231f4824042ee1a2b1a54062045b1519b06ab
parentfa41fe85ce591bf3352bb6444bae2441d33e8bb5
Merge branch 'linus' into x86/entry, to resolve conflicts

Conflicts:
arch/x86/kernel/traps.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/traps.c
include/linux/compiler_types.h