From: Ingo Molnar Date: Wed, 28 Oct 2015 12:17:01 +0000 (+0100) Subject: Merge branch 'linus' into core/rcu, to fix up a semantic conflict X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~11374^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e4340bbb07dd38339c0773543dd928886e512a57;p=mirror_ubuntu-focal-kernel.git Merge branch 'linus' into core/rcu, to fix up a semantic conflict Signed-off-by: Ingo Molnar --- e4340bbb07dd38339c0773543dd928886e512a57