From 8dc2bbe72ec31469286027ebce6a00f05ef38a9f Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Mon, 29 Aug 2011 18:42:37 +0100 Subject: MAINAINERS: Add details for drivers/staging/et131x Adding myself as a maintainer for this driver, as I appear to have been the only interested party for some time. Not sure if Olaf Hartman is still interested? So will leave it up to him to add his name to the list. Signed-off-by: Mark Einon Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1a8cc600067d..4f00a54ba345 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6172,6 +6172,11 @@ M: David Rowe S: Odd Fixes F: drivers/staging/echo/ +STAGING - ET131X NETWORK DRIVER +M: Mark Einon +S: Odd Fixes +F: drivers/staging/et131x/ + STAGING - FLARION FT1000 DRIVERS M: Marek Belisko S: Odd Fixes -- cgit v1.2.1 From 7c6b6c7110a2b51d579f791aaaf4878ebf066962 Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Tue, 27 Sep 2011 19:00:46 +0200 Subject: staging: nvec: add MAINTAINERS info This adds the relevant info to the MAINTAINERS file so people can find the right person to blame. Signed-off-by: Marc Dietrich Signed-off-by: Julian Andres Klode Acked-by: Marc Dietrich Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4f00a54ba345..fe393cd79f00 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6205,6 +6205,12 @@ W: http://www.lirc.org/ S: Odd Fixes F: drivers/staging/lirc/ +STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) +M: Marc Dietrich +L: ac100@lists.launchpad.net (moderated for non-subscribers) +S: Maintained +F: drivers/staging/nvec/ + STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON) M: Andres Salomon M: Chris Ball -- cgit v1.2.1 From b812538234397adf170ba4e218d35c8e5d0604fd Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 27 Sep 2011 19:01:05 +0200 Subject: staging: nvec: Add myself to MAINTAINERS I intent to support this code, especially the parts I wrote; and will thus enter as co-maintainer. Signed-off-by: Julian Andres Klode Acked-by: Marc Dietrich Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index fe393cd79f00..ed3795a15ab0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6206,6 +6206,7 @@ S: Odd Fixes F: drivers/staging/lirc/ STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) +M: Julian Andres Klode M: Marc Dietrich L: ac100@lists.launchpad.net (moderated for non-subscribers) S: Maintained -- cgit v1.2.1 From 630081fdc94fb71394fc21d6c60772cbb52d04ea Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 Oct 2011 16:02:41 -0700 Subject: MAINTAINERS: the staging tree dropped the "-2.6" suffix Now that we are in the 3.x days, "2.6" doesn't make sense. Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index ed3795a15ab0..6ae6c53913ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6125,7 +6125,7 @@ S: Maintained STAGING SUBSYSTEM M: Greg Kroah-Hartman -T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git L: devel@driverdev.osuosl.org S: Maintained F: drivers/staging/ -- cgit v1.2.1