commit | 31c7ac388aa905a196ee16dff2015111f701f035 | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@kernel.org> | Mon Jan 06 07:51:15 2020 +0100 |
committer | Ingo Molnar <mingo@kernel.org> | Mon Jan 06 07:51:15 2020 +0100 |
tree | 09a43dde7fbf30ce57eaf5ba7ebda84da961538d | |
parent | 28336be568bb473d16ba80db0801276fb4f1bbe5 [diff] | |
parent | c79f46a282390e0f5b306007bf7b11a46d529538 [diff] |
Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict Signed-off-by: Ingo Molnar <mingo@kernel.org>