diff options
| -rw-r--r-- | .mailmap | 5 | ||||
| -rw-r--r-- | MAINTAINERS | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -129,6 +129,11 @@ Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net> Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com> Jens Axboe <axboe@suse.de> Jens Osterkamp <Jens.Osterkamp@de.ibm.com> +Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com> +Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com> +Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com> +Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz> +Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz> Johan Hovold <johan@kernel.org> <jhovold@gmail.com> Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> diff --git a/MAINTAINERS b/MAINTAINERS index 68f21d46614c..b926f64f53ab 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/ |