X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=6ae6c53913acaf1af3e02edb97292350ca297de8;hb=c11d0ef3e250a4483e10e6984362b07fbf12c5ae;hp=1a8cc600067de562e9734d1b5b12a7dce228a059;hpb=7a54f5e19f90342340112939ef592fff20fc370c;p=~andy%2Flinux diff --git a/MAINTAINERS b/MAINTAINERS index 1a8cc600067..6ae6c53913a 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/ @@ -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 @@ -6200,6 +6205,13 @@ W: http://www.lirc.org/ 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 +F: drivers/staging/nvec/ + STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON) M: Andres Salomon M: Chris Ball