Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Mon, 6 Jan 2020 06:51:15 +0000 (07:51 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 6 Jan 2020 06:51:15 +0000 (07:51 +0100)
commit31c7ac388aa905a196ee16dff2015111f701f035
tree09a43dde7fbf30ce57eaf5ba7ebda84da961538d
parent28336be568bb473d16ba80db0801276fb4f1bbe5
parentc79f46a282390e0f5b306007bf7b11a46d529538
Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
MAINTAINERS
Makefile
init/main.c