From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jul 2024 21:08:42 +0000 (-0700)
Subject: Merge tag 'trace-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Tag: v6.11-rc1~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f669aac34c5f76b58e6cad1fef0643e5ae16d413;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'trace-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull tracing CREDITS file update from Steven Rostedt:
 "Update of MAINTAINERS and CREDITS file

   - Update Daniel Bristot de Oliveira's entry in MAINTAINERS with
     respect to his tracing code.

   - Add more credits to him in CREDITS file and move his entry to be
     alphabetical"

* tag 'trace-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Update MAINTAINERS file
---

f669aac34c5f76b58e6cad1fef0643e5ae16d413