summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-02-18 15:35:05 -0600
committerFelix Blyakher <felixb@sgi.com>2009-02-18 15:35:05 -0600
commit01234f3c87fff1d83adef8a70fdc18f27d67d75c (patch)
tree95a24fe0b257404ca1ee01faee7e2201e3632b9f /MAINTAINERS
parent8aa4349ad527db56724b1ab9478db65a8065e0bb (diff)
parent5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff)
downloadlinux-01234f3c87fff1d83adef8a70fdc18f27d67d75c.tar.gz
linux-01234f3c87fff1d83adef8a70fdc18f27d67d75c.tar.bz2
linux-01234f3c87fff1d83adef8a70fdc18f27d67d75c.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 7 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 185603fad6a8..566eff911f91 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1905,10 +1905,10 @@ W: http://gigaset307x.sourceforge.net/
S: Maintained
HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
-P: Robert Love
-M: rlove@rlove.org
-M: linux-kernel@vger.kernel.org
-W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
+P: Frank Seidel
+M: frank@f-seidel.de
+L: lm-sensors@lm-sensors.org
+W: http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
S: Maintained
GSPCA FINEPIX SUBDRIVER
@@ -4925,11 +4925,11 @@ L: zd1211-devs@lists.sourceforge.net (subscribers-only)
S: Maintained
ZR36067 VIDEO FOR LINUX DRIVER
-P: Ronald Bultje
-M: rbultje@ronald.bitfreak.net
L: mjpeg-users@lists.sourceforge.net
+L: linux-media@vger.kernel.org
W: http://mjpeg.sourceforge.net/driver-zoran/
-S: Maintained
+T: Mercurial http://linuxtv.org/hg/v4l-dvb
+S: Odd Fixes
ZS DECSTATION Z85C30 SERIAL DRIVER
P: Maciej W. Rozycki