From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jun 2021 20:06:24 +0000 (-0700)
Subject: Merge tag 'x86-cache-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.14-rc1~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98e62da8b3ee9ac3faf388fd78ee982a765170a7;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86-cache-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 resource control documentation fixes from Ingo Molnar:
 "Fix Docbook comments in the x86/resctrl code"

* tag 'x86-cache-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Fix kernel-doc in internal.h
  x86/resctrl: Fix kernel-doc in pseudo_lock.c
---

98e62da8b3ee9ac3faf388fd78ee982a765170a7