refs/heads/smp/init-merge - pub/scm/linux/kernel/git/tglx/devel

commit: c95420b40508c5c887e29aca6bd904a8389d6b90
[log]
author: Thomas Gleixner <tglx@linutronix.de>
Fri Jun 16 10:51:23 2023 +0200
committer: Thomas Gleixner <tglx@linutronix.de>
Fri Jun 16 10:51:23 2023 +0200
tree: 850bb6ca87fccba8bec9b89d4eeacc65be96131d
parent: 60be49bdf1d4ddb9e2deb7aa718d5b8bc167ee4e [diff]
parent: b81fac906a8f9e682e513ddd95697ec7a20878d4 [diff]

Merge branch 'x86/boot' of ../tip into smp/init-merge

Resolve the conflicts between smp/core and x86/boot

tree: 850bb6ca87fccba8bec9b89d4eeacc65be96131d