aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS24
1 files changed, 23 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e73060fe0788..027ec2bfa135 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -235,6 +235,7 @@ F: drivers/platform/x86/acer-wmi.c
235 235
236ACPI 236ACPI
237M: Len Brown <lenb@kernel.org> 237M: Len Brown <lenb@kernel.org>
238M: Rafael J. Wysocki <rjw@sisk.pl>
238L: linux-acpi@vger.kernel.org 239L: linux-acpi@vger.kernel.org
239W: http://www.lesswatts.org/projects/acpi/ 240W: http://www.lesswatts.org/projects/acpi/
240Q: http://patchwork.kernel.org/project/linux-acpi/list/ 241Q: http://patchwork.kernel.org/project/linux-acpi/list/
@@ -4372,7 +4373,7 @@ F: Documentation/scsi/53c700.txt
4372F: drivers/scsi/53c700* 4373F: drivers/scsi/53c700*
4373 4374
4374LED SUBSYSTEM 4375LED SUBSYSTEM
4375M: Bryan Wu <bryan.wu@canonical.com> 4376M: Bryan Wu <cooloney@gmail.com>
4376M: Richard Purdie <rpurdie@rpsys.net> 4377M: Richard Purdie <rpurdie@rpsys.net>
4377L: linux-leds@vger.kernel.org 4378L: linux-leds@vger.kernel.org
4378T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git 4379T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
@@ -5019,6 +5020,20 @@ F: net/ipv6/
5019F: include/net/ip* 5020F: include/net/ip*
5020F: arch/x86/net/* 5021F: arch/x86/net/*
5021 5022
5023NETWORKING [IPSEC]
5024M: Steffen Klassert <steffen.klassert@secunet.com>
5025M: Herbert Xu <herbert@gondor.apana.org.au>
5026M: "David S. Miller" <davem@davemloft.net>
5027L: netdev@vger.kernel.org
5028T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
5029S: Maintained
5030F: net/xfrm/
5031F: net/key/
5032F: net/ipv4/xfrm*
5033F: net/ipv6/xfrm*
5034F: include/uapi/linux/xfrm.h
5035F: include/net/xfrm.h
5036
5022NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) 5037NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
5023M: Paul Moore <paul@paul-moore.com> 5038M: Paul Moore <paul@paul-moore.com>
5024L: netdev@vger.kernel.org 5039L: netdev@vger.kernel.org
@@ -7731,6 +7746,13 @@ W: http://www.ideasonboard.org/uvc/
7731S: Maintained 7746S: Maintained
7732F: drivers/media/usb/uvc/ 7747F: drivers/media/usb/uvc/
7733 7748
7749USB WEBCAM GADGET
7750M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
7751L: linux-usb@vger.kernel.org
7752S: Maintained
7753F: drivers/usb/gadget/*uvc*.c
7754F: drivers/usb/gadget/webcam.c
7755
7734USB WIRELESS RNDIS DRIVER (rndis_wlan) 7756USB WIRELESS RNDIS DRIVER (rndis_wlan)
7735M: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> 7757M: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
7736L: linux-wireless@vger.kernel.org 7758L: linux-wireless@vger.kernel.org