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

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5d8971c..be05ef9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1984,7 +1984,7 @@ P:        Carlos Corbacho
 M:     carlos@strangeworlds.co.uk
 S:     Odd Fixes
 
-HPET:  High Precision Event Timers driver (hpet.c)
+HPET:  High Precision Event Timers driver (drivers/char/hpet.c)
 P:     Clemens Ladisch
 M:     clemens@ladisch.de
 S:     Maintained
@@ -2937,8 +2937,6 @@ P:        Faisal Latif
 M:     flatif@neteffect.com
 P:     Chien Tung
 M:     ctung@neteffect.com
-P:     Glenn Streiff
-M:     gstreiff@neteffect.com
 L:     general@lists.openfabrics.org
 W:     http://www.neteffect.com
 S:     Supported
@@ -4080,12 +4078,6 @@ W:       http://www.prosec.rub.de/tpm/
 L:     tpmdd-devel@lists.sourceforge.net
 S:     Maintained
 
-TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE
-P:     Muli Ben-Yehuda
-M:     mulix@mulix.org
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
 TRIVIAL PATCHES
 P:     Jesper Juhl
 M:     trivial@kernel.org
@@ -4131,9 +4123,6 @@ W:        http://www.uclinux.org/
 L:     uclinux-dev@uclinux.org  (subscribers-only)
 S:     Maintained
 
-UCLINUX FOR NEC V850
-P:     Miles Bader
-
 UCLINUX FOR RENESAS H8/300
 P:     Yoshinori Sato
 M:     ysato@users.sourceforge.jp