]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1777e47 5f7c72d)
Merge tag 'trace-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jul 2024 21:08:42 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jul 2024 21:08:42 +0000 (14:08 -0700)
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

1  2 
CREDITS patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.