summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-27 19:37:12 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-27 19:37:12 +0300
commit79a17dd9d2491443a0d03745adbb3d76ab97a356 (patch)
treed1e8882799f1ba20470f169ac0b6d96f7dfc98ba /MAINTAINERS
parent1993cbf06aa95c0fcf080f2e858c116306b6c29e (diff)
parentb00e2fd10429eddf4a181ad30af010e56c2303f9 (diff)
downloadlinux-79a17dd9d2491443a0d03745adbb3d76ab97a356.tar.xz
Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH: "Here are two staging driver fixups for 4.17-rc3. The first is the remaining stragglers of the irda code removal that you pointed out during the merge window. The second is a fix for the wilc1000 driver due to a patch that got merged in 4.17-rc1. Both of these have been in linux-next for a while with no reported issues" * tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info() staging: irda: remove remaining remants of irda code removal
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 0 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cc996af953b8..1901ef510b43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7410,16 +7410,6 @@ S: Obsolete
F: include/uapi/linux/ipx.h
F: drivers/staging/ipx/
-IRDA SUBSYSTEM
-M: Samuel Ortiz <samuel@sortiz.org>
-L: irda-users@lists.sourceforge.net (subscribers-only)
-L: netdev@vger.kernel.org
-W: http://irda.sourceforge.net/
-S: Obsolete
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
-F: Documentation/networking/irda.txt
-F: drivers/staging/irda/
-
IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
M: Marc Zyngier <marc.zyngier@arm.com>
S: Maintained