From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 May 2025 09:55:07 +0000 (+1000)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca81c9412eea24516b1e6f7e41c5215aff096394;p=users%2Fhch%2Fmisc.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git

# Conflicts:
#	tools/power/x86/turbostat/turbostat.8
#	tools/power/x86/turbostat/turbostat.c
---

ca81c9412eea24516b1e6f7e41c5215aff096394