aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 19:29:27 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 19:29:27 -0500
commitb4669d66fb1488fd9cebe0b8da447cfeb86109ba (patch)
tree2beaba0e7d8acac9703667aff5f9bc9f4d4357d6 /MAINTAINERS
parentb43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf (diff)
parentc5e3fbf22ccba0879b174fab7ec0e322b1266c2c (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a05aefdea60..b22db521cec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -931,6 +931,12 @@ M: sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
931L: ext3-users@redhat.com 931L: ext3-users@redhat.com
932S: Maintained 932S: Maintained
933 933
934F71805F HARDWARE MONITORING DRIVER
935P: Jean Delvare
936M: khali@linux-fr.org
937L: lm-sensors@lm-sensors.org
938S: Maintained
939
934FARSYNC SYNCHRONOUS DRIVER 940FARSYNC SYNCHRONOUS DRIVER
935P: Kevin Curtis 941P: Kevin Curtis
936M: kevin.curtis@farsite.co.uk 942M: kevin.curtis@farsite.co.uk