aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-17 11:04:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-17 11:04:10 -0700
commit1b29d271614abd97cc39782daa9d6dd70e98609f (patch)
tree11413c99e8b0f423c949ca4f35dfc38dc002dc94
parent670062e7e4199b13980cd1d46796beb05c4a8699 (diff)
parentb3dad076a058916c443c93074dc3ee80baaff4ea (diff)
downloadlinux-1b29d271614abd97cc39782daa9d6dd70e98609f.tar.gz
Merge tag 'staging-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fix from Greg KH: "Here is a single staging driver "fix" for 6.4-rc7. I've been sitting on it in my tree for many weeks as it is just a simple documentation update, with the hope that maybe some other staging driver fixes would need to be merged for 6.4-final, but that does not seem to be the case. So please, pull in this one documentation update so that Aaro doesn't get emails going forward that he can't do anything about" * tag 'staging-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: octeon: delete my name from TODO contact
-rw-r--r--drivers/staging/octeon/TODO1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/octeon/TODO b/drivers/staging/octeon/TODO
index 67a0a1f6b922ed..044e48e3d65f66 100644
--- a/drivers/staging/octeon/TODO
+++ b/drivers/staging/octeon/TODO
@@ -6,4 +6,3 @@ TODO:
- make driver self-contained instead of being split between staging and
arch/mips/cavium-octeon.
-Contact: Aaro Koskinen <aaro.koskinen@iki.fi>