aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-03 23:54:56 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-03 23:54:56 -0400
commit73561695b2e77473e353a5ae63bab81ed5098d8e (patch)
treed039affaa54d38985e41566e4d62e0aa6a170287 /MAINTAINERS
parent6f2f38128170814e151cfedf79532e19cd179567 (diff)
parent8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff)
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b8483334de1..65ad8251e4bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -239,6 +239,12 @@ L: linux-usb-devel@lists.sourceforge.net
239W: http://www.linux-usb.org/SpeedTouch/ 239W: http://www.linux-usb.org/SpeedTouch/
240S: Maintained 240S: Maintained
241 241
242ALI1563 I2C DRIVER
243P: Rudolf Marek
244M: r.marek@sh.cvut.cz
245L: sensors@stimpy.netroedge.com
246S: Maintained
247
242ALPHA PORT 248ALPHA PORT
243P: Richard Henderson 249P: Richard Henderson
244M: rth@twiddle.net 250M: rth@twiddle.net
@@ -1023,8 +1029,8 @@ W: http://www.ia64-linux.org/
1023S: Maintained 1029S: Maintained
1024 1030
1025SN-IA64 (Itanium) SUB-PLATFORM 1031SN-IA64 (Itanium) SUB-PLATFORM
1026P: Jesse Barnes 1032P: Greg Edwards
1027M: jbarnes@sgi.com 1033M: edwardsg@sgi.com
1028L: linux-altix@sgi.com 1034L: linux-altix@sgi.com
1029L: linux-ia64@vger.kernel.org 1035L: linux-ia64@vger.kernel.org
1030W: http://www.sgi.com/altix 1036W: http://www.sgi.com/altix