aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-04-16 02:17:28 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-04-16 02:17:28 -0700
commit0874802cd174e9770b98d8a10ea93aefd7323d85 (patch)
tree6aef34c44d3e1233ff944236485276abeeb09fca /MAINTAINERS
parent32686b9d8bc6001d7365caa517adef393548021d (diff)
parentd63bce0550760bbde8ed65cffbdb91b1e36cb5d5 (diff)
downloadhistory-0874802cd174e9770b98d8a10ea93aefd7323d85.tar.gz
Merge bk://gkernel.bkbits.net/misc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d1a672b01c0754..5df0bd9766e68d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2276,9 +2276,8 @@ M: hirofumi@mail.parknet.co.jp
L: linux-kernel@vger.kernel.org
S: Maintained
-VIA 82Cxxx AUDIO DRIVER
+VIA 82Cxxx AUDIO DRIVER (old OSS driver)
P: Jeff Garzik
-L: linux-via@gtf.org
S: Odd fixes
VIA RHINE NETWORK DRIVER