diff --git a/[refs] b/[refs] index fd4bf0d3da0f..81457321a042 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cdeff497a5279c0dc754c639cad83b8120810b6 +refs/heads/master: 7c6b6c7110a2b51d579f791aaaf4878ebf066962 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4f00a54ba345..fe393cd79f00 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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