diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 09:26:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 09:26:06 -0700 |
| commit | cad18da0afb1bc7b37d73a74067ab7ff5974897c (patch) | |
| tree | 5e51cad8d8be18967c802e1b30b94eff49f74811 /MAINTAINERS | |
| parent | d71e064449a704a026fa032ec852d532f08aefa1 (diff) | |
| parent | 172e7890406d6183b9b39271ffb434ff0a97ce72 (diff) | |
Merge tag 'please-pull-ia64_for_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 updates from Tony Luck:
"Couple of cleanup patches"
* tag 'please-pull-ia64_for_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
tty/serial: cleanup after ioc*_serial driver removal
ia64: replace setup_irq() by request_irq()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c5ae60a85a22..fe43e1c4b8e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7978,6 +7978,7 @@ L: linux-ia64@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git S: Maintained F: arch/ia64/ +F: Documentation/ia64/ IBM Power 842 compression accelerator M: Haren Myneni <haren@us.ibm.com> @@ -15095,14 +15096,6 @@ M: Dimitri Sivanich <sivanich@sgi.com> S: Maintained F: drivers/misc/sgi-gru/ -SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER -M: Pat Gefre <pfg@sgi.com> -L: linux-ia64@vger.kernel.org -S: Supported -F: Documentation/ia64/serial.rst -F: drivers/tty/serial/ioc?_serial.c -F: include/linux/ioc?.h - SGI XP/XPC/XPNET DRIVER M: Cliff Whickman <cpw@sgi.com> M: Robin Holt <robinmholt@gmail.com> |