aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-20 17:43:44 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-20 17:43:44 -0800
commit7b7054599309955675efc71324c762ede0982d15 (patch)
tree520af4d4d79dddfcf57b79245ecae8f597292e3e /MAINTAINERS
parent9b2f107fc1b33b5230443acbaca6f52ccfa68e5e (diff)
parent45088fd066a4a1a93be47aafc2bc4b5f0c2069ae (diff)
downloadhistory-7b7054599309955675efc71324c762ede0982d15.tar.gz
Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8217e83941ad15..d3dc9555cdccf3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2495,6 +2495,13 @@ M: johnpol@2ka.mipt.ru
L: sensors@stimpy.netroedge.com
S: Maintained
+W83L51xD SD/MMC CARD INTERFACE DRIVER
+P: Pierre Ossman
+M: drzeus-wbsd@drzeus.cx
+L: wbsd-devel@list.drzeus.cx
+W: http://projects.drzeus.cx/wbsd
+S: Maintained
+
W83L785TS HARDWARE MONITOR DRIVER
P: Jean Delvare
M: khali@linux-fr.org