commit | f669aac34c5f76b58e6cad1fef0643e5ae16d413 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 18 14:08:42 2024 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 18 14:08:42 2024 -0700 |
tree | 2fd3bfbe444ce62a4434a23df7303f58ff6c2b6f | |
parent | 1777e471e11da7cba3db8dfa82822dcef6fd7794 [diff] | |
parent | 5f7c72df1ba6ba00ee163ba4049c785ac5930759 [diff] |
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