diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2020-06-26 09:36:23 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2020-06-26 09:36:23 -0600 |
| commit | ee98fac8e06cbdc91b2d76293eda65bd759add6c (patch) | |
| tree | ed0b19c467acf19982030921624138b60d57e882 /MAINTAINERS | |
| parent | 46e906144c3f4b0a7b6dcc7713fafad65b1859e0 (diff) | |
| parent | 7d9c29bb6c7f41e0a9204377e57935a373677572 (diff) | |
Merge branch 'docs-fixes' into docs-next
Bring a handful of (relatively) urgent fixes into docs-next as well.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ad90b3992887..eec6923a89ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2881,7 +2881,7 @@ S: Supported F: drivers/net/wireless/ath/* ATHEROS ATH5K WIRELESS DRIVER -M: Jiri Slaby <jirislaby@gmail.com> +M: Jiri Slaby <jirislaby@kernel.org> M: Nick Kossifidis <mickflemm@gmail.com> M: Luis Chamberlain <mcgrof@kernel.org> L: linux-wireless@vger.kernel.org @@ -11560,7 +11560,7 @@ F: drivers/media/pci/meye/ F: include/uapi/linux/meye.h MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD -M: Jiri Slaby <jirislaby@gmail.com> +M: Jiri Slaby <jirislaby@kernel.org> S: Maintained F: Documentation/driver-api/serial/moxa-smartio.rst F: drivers/tty/mxser.* @@ -15348,7 +15348,7 @@ F: scripts/selinux/ F: security/selinux/ SENSABLE PHANTOM -M: Jiri Slaby <jirislaby@gmail.com> +M: Jiri Slaby <jirislaby@kernel.org> S: Maintained F: drivers/misc/phantom.c F: include/uapi/linux/phantom.h @@ -17365,7 +17365,7 @@ K: ^Subject:.*(?i)trivial TTY LAYER M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -M: Jiri Slaby <jslaby@suse.com> +M: Jiri Slaby <jirislaby@kernel.org> S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git F: Documentation/driver-api/serial/ |