aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS21
1 files changed, 13 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d6f04a81f761..f0596e452c5c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1137,9 +1137,9 @@ T: git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
1137S: Maintained 1137S: Maintained
1138 1138
1139DSCC4 DRIVER 1139DSCC4 DRIVER
1140P: François Romieu 1140P: Francois Romieu
1141M: romieu@cogenit.fr 1141M: romieu@fr.zoreil.com
1142M: romieu@ensta.fr 1142L: netdev@vger.kernel.org
1143S: Maintained 1143S: Maintained
1144 1144
1145DVB SUBSYSTEM AND DRIVERS 1145DVB SUBSYSTEM AND DRIVERS
@@ -1928,11 +1928,10 @@ S: Maintained
1928 1928
1929KERNEL NFSD 1929KERNEL NFSD
1930P: Neil Brown 1930P: Neil Brown
1931M: neilb@cse.unsw.edu.au 1931M: neilb@suse.de
1932L: nfs@lists.sourceforge.net 1932L: nfs@lists.sourceforge.net
1933W: http://nfs.sourceforge.net/ 1933W: http://nfs.sourceforge.net/
1934W: http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/ 1934S: Supported
1935S: Maintained
1936 1935
1937KERNEL VIRTUAL MACHINE (KVM) 1936KERNEL VIRTUAL MACHINE (KVM)
1938P: Avi Kivity 1937P: Avi Kivity
@@ -2993,9 +2992,9 @@ SOFTWARE RAID (Multiple Disks) SUPPORT
2993P: Ingo Molnar 2992P: Ingo Molnar
2994M: mingo@redhat.com 2993M: mingo@redhat.com
2995P: Neil Brown 2994P: Neil Brown
2996M: neilb@cse.unsw.edu.au 2995M: neilb@suse.de
2997L: linux-raid@vger.kernel.org 2996L: linux-raid@vger.kernel.org
2998S: Maintained 2997S: Supported
2999 2998
3000SOFTWARE SUSPEND: 2999SOFTWARE SUSPEND:
3001P: Pavel Machek 3000P: Pavel Machek
@@ -3575,6 +3574,12 @@ M: khali@linux-fr.org
3575L: i2c@lm-sensors.org 3574L: i2c@lm-sensors.org
3576S: Maintained 3575S: Maintained
3577 3576
3577VIA VELOCITY NETWORK DRIVER
3578P: Francois Romieu
3579M: romieu@fr.zoreil.com
3580L: netdev@vger.kernel.org
3581S: Maintained
3582
3578UCLINUX (AND M68KNOMMU) 3583UCLINUX (AND M68KNOMMU)
3579P: Greg Ungerer 3584P: Greg Ungerer
3580M: gerg@uclinux.org 3585M: gerg@uclinux.org