diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 11:03:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 11:03:31 -0700 |
| commit | 91dbc047e9c1284634ae3570c0382c2288c5548b (patch) | |
| tree | d0df267e626e6404dd040be94c670eed2eddfbc1 /MAINTAINERS | |
| parent | ef19df60c9506e7ffe78d6a60048936c4e76a0a2 (diff) | |
| parent | b1d562acc78f0af46de0dfe447410bc40bdb7ece (diff) | |
Merge tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two tiny staging tree fixes for 4.3-rc5.
One fixes the broken speakup subsystem as reported by a user, and the
other removes an entry in the MAINTAINERS file for a developer that
doesn't want to be listed anymore"
* tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: speakup: fix speakup-r regression
MAINTAINERS: Remove myself as nvec co-maintainer
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 60aacd88bd7f..b9ce3c6049b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9914,7 +9914,6 @@ S: Maintained F: drivers/staging/lustre STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) -M: Julian Andres Klode <jak@jak-linux.org> M: Marc Dietrich <marvin24@gmx.de> L: ac100@lists.launchpad.net (moderated for non-subscribers) L: linux-tegra@vger.kernel.org |