From 8282da478966975a5efff3eeb650a49fe67fa14e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 4 Oct 2012 02:32:42 +0200 Subject: MAINTAINERS: Add maintainer entry for the USB webcam gadget Signed-off-by: Laurent Pinchart Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index e73060f..bfac52f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7731,6 +7731,13 @@ W: http://www.ideasonboard.org/uvc/ S: Maintained F: drivers/media/usb/uvc/ +USB WEBCAM GADGET +M: Laurent Pinchart +L: linux-usb@vger.kernel.org +S: Maintained +F: drivers/usb/gadget/*uvc*.c +F: drivers/usb/gadget/webcam.c + USB WIRELESS RNDIS DRIVER (rndis_wlan) M: Jussi Kivilinna L: linux-wireless@vger.kernel.org -- cgit v1.1 From 73b7656ce4e09eb137ee6f845a9e11a7f132df1c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 16 Oct 2012 14:08:40 -0400 Subject: MAINTAINERS: Add explicit section for IPSEC networking. Signed-off-by: David S. Miller --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index e73060f..6d6632f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5019,6 +5019,20 @@ F: net/ipv6/ F: include/net/ip* F: arch/x86/net/* +NETWORKING [IPSEC] +M: Steffen Klassert +M: Herbert Xu +M: "David S. Miller" +L: netdev@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git +S: Maintained +F: net/xfrm/ +F: net/key/ +F: net/ipv4/xfrm* +F: net/ipv6/xfrm* +F: include/uapi/linux/xfrm.h +F: include/net/xfrm.h + NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) M: Paul Moore L: netdev@vger.kernel.org -- cgit v1.1 From c772fc26f8938dd526a411a6162db95a33f56028 Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Tue, 16 Oct 2012 12:55:19 -0700 Subject: MAINTAINERS: change email after moving for LED subsystem maintaining Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index e73060f..e39e9da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4372,7 +4372,7 @@ F: Documentation/scsi/53c700.txt F: drivers/scsi/53c700* LED SUBSYSTEM -M: Bryan Wu +M: Bryan Wu M: Richard Purdie L: linux-leds@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git -- cgit v1.1 From ea26d0cff44420052495731af34fcab561d3953a Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 19 Oct 2012 07:11:44 +0200 Subject: MAINTAINERS: Add Rafael's address to ACPI maintainers Since I will be maintaining ACPI together with Len from now on, add my address to the ACPI maintainers list in the MAINTAINERS file (this is the address to send patches to). Signed-off-by: Rafael J. Wysocki Acked-by: Len Brown Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 41c5349..8f18ba0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -235,6 +235,7 @@ F: drivers/platform/x86/acer-wmi.c ACPI M: Len Brown +M: Rafael J. Wysocki L: linux-acpi@vger.kernel.org W: http://www.lesswatts.org/projects/acpi/ Q: http://patchwork.kernel.org/project/linux-acpi/list/ -- cgit v1.1