aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2004-02-08 23:42:17 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-08 23:42:17 -0800
commited3627364383919670c8555c1722b1bba5b1f4be (patch)
tree191140cf4833acd37420b61d70c10ccb9241e681 /MAINTAINERS
parentcac3337b025e1ce54c49e09160f64d505fa74293 (diff)
parentc9ebf6efdcff6416657d9bb97148742c7fd4d36f (diff)
downloadhistory-ed3627364383919670c8555c1722b1bba5b1f4be.tar.gz
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 5 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 37a171bcfae9d5..928a12b1905f35 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -922,15 +922,13 @@ M: drivers@neukum.org
S: Maintained
I2C AND SENSORS DRIVERS
-P: Frodo Looijaard
-M: frodol@dds.nl
-P: Philip Edelbrock
-M: phil@netroedge.com
P: Greg Kroah-Hartman
M: greg@kroah.com
-L: sensors@stimpy.netroedge.com
-W: http://www.lm-sensors.nu/
-S: Maintained
+P: Philip Edelbrock
+M: phil@netroedge.com
+L: sensors@stimpy.netroedge.com
+W: http://www.lm-sensors.nu/
+S: Maintained
i386 BOOT CODE
P: Riley H. Williams