summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-18 14:08:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-18 14:08:42 -0700
commitf669aac34c5f76b58e6cad1fef0643e5ae16d413 (patch)
tree2fd3bfbe444ce62a4434a23df7303f58ff6c2b6f /CREDITS
parent1777e471e11da7cba3db8dfa82822dcef6fd7794 (diff)
parent5f7c72df1ba6ba00ee163ba4049c785ac5930759 (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
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS10
1 files changed, 7 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index d6cbd4c792a1..053e5a5003eb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -271,9 +271,6 @@ D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
D: Various bugfixes and changes to sound drivers
S: USA
-N: Daniel Bristot de Oliveira
-D: Scheduler contributions, notably: SCHED_DEADLINE
-
N: Carlos Henrique Bauer
E: chbauer@acm.org
E: bauer@atlas.unisinos.br
@@ -534,6 +531,13 @@ S: Kopmansg 2
S: 411 13 Goteborg
S: Sweden
+N: Daniel Bristot de Oliveira
+D: Scheduler contributions, notably: SCHED_DEADLINE
+D: Real-time Linux Analysis
+D: Runtime Verification
+D: OS Noise and Latency Tracers
+S: Brazil and Italy
+
N: Paul Bristow
E: paul@paulbristow.net
W: https://paulbristow.net/linux/idefloppy.html