Merge tag 'x86-cache-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2021 20:06:24 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2021 20:06:24 +0000 (13:06 -0700)
commit98e62da8b3ee9ac3faf388fd78ee982a765170a7
tree2d9ea423f7dc8ca764b1ea27b0a5041f22644b58
parent1b98ed0e83577bc03515f498a5de342f7dbf0b47
parentfd2afa70eff057fab57c9e06708b68677b261a0c
Merge tag 'x86-cache-2021-06-28' of git://git./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