From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Jun 2024 16:04:33 +0000 (-0700)
Subject: Merge tag 'v6.10-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb... 
X-Git-Tag: v6.10-rc6~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=234458d049b81d27e76410360a98dc20b295d064;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v6.10-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull turbostat fixes from Len Brown:
 "Fix three recent minor turbostat regressions"

* tag 'v6.10-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: Add local build_bug.h header for snapshot target
  tools/power turbostat: Fix unc freq columns not showing with '-q' or '-l'
  tools/power turbostat: option '-n' is ambiguous
---

234458d049b81d27e76410360a98dc20b295d064