diff options
author | <jgarzik@pretzel.yyz.us> | 2005-06-03 23:54:56 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-03 23:54:56 -0400 |
commit | 73561695b2e77473e353a5ae63bab81ed5098d8e (patch) | |
tree | d039affaa54d38985e41566e4d62e0aa6a170287 /MAINTAINERS | |
parent | 6f2f38128170814e151cfedf79532e19cd179567 (diff) | |
parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 10 |
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 | |||
239 | W: http://www.linux-usb.org/SpeedTouch/ | 239 | W: http://www.linux-usb.org/SpeedTouch/ |
240 | S: Maintained | 240 | S: Maintained |
241 | 241 | ||
242 | ALI1563 I2C DRIVER | ||
243 | P: Rudolf Marek | ||
244 | M: r.marek@sh.cvut.cz | ||
245 | L: sensors@stimpy.netroedge.com | ||
246 | S: Maintained | ||
247 | |||
242 | ALPHA PORT | 248 | ALPHA PORT |
243 | P: Richard Henderson | 249 | P: Richard Henderson |
244 | M: rth@twiddle.net | 250 | M: rth@twiddle.net |
@@ -1023,8 +1029,8 @@ W: http://www.ia64-linux.org/ | |||
1023 | S: Maintained | 1029 | S: Maintained |
1024 | 1030 | ||
1025 | SN-IA64 (Itanium) SUB-PLATFORM | 1031 | SN-IA64 (Itanium) SUB-PLATFORM |
1026 | P: Jesse Barnes | 1032 | P: Greg Edwards |
1027 | M: jbarnes@sgi.com | 1033 | M: edwardsg@sgi.com |
1028 | L: linux-altix@sgi.com | 1034 | L: linux-altix@sgi.com |
1029 | L: linux-ia64@vger.kernel.org | 1035 | L: linux-ia64@vger.kernel.org |
1030 | W: http://www.sgi.com/altix | 1036 | W: http://www.sgi.com/altix |