Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 64d7621..5a9d67a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -496,7 +496,6 @@ S:  Supported
 F:     arch/x86/kernel/microcode_amd.c
 
 AMS (Apple Motion Sensor) DRIVER
-M:     Stelian Pop <stelian@popies.net>
 M:     Michael Hanselmann <linux-kernel@hansmi.ch>
 S:     Supported
 F:     drivers/macintosh/ams/
@@ -4093,9 +4092,8 @@ F:        include/linux/module.h
 F:     kernel/module.c
 
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
-M:     Stelian Pop <stelian@popies.net>
 W:     http://popies.net/meye/
-S:     Maintained
+S:     Orphan
 F:     Documentation/video4linux/meye.txt
 F:     drivers/media/video/meye.*
 F:     include/linux/meye.h
@@ -5133,11 +5131,6 @@ F:       kernel/rcu*
 F:     kernel/srcu*
 X:     kernel/rcutorture.c
 
-REAL TIME CLOCK DRIVER (LEGACY)
-M:     Paul Gortmaker <p_gortmaker@yahoo.com>
-S:     Maintained
-F:     drivers/char/rtc.c
-
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:     Alessandro Zummo <a.zummo@towertech.it>
 L:     rtc-linux@googlegroups.com
@@ -6587,7 +6580,7 @@ F:        net/8021q/
 
 VLYNQ BUS
 M:     Florian Fainelli <florian@openwrt.org>
-L:     openwrt-devel@lists.openwrt.org
+L:     openwrt-devel@lists.openwrt.org (subscribers-only)
 S:     Maintained
 F:     drivers/vlynq/vlynq.c
 F:     include/linux/vlynq.h