diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-06 03:21:03 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-06 03:21:03 -0400 |
commit | 3c241f8337542655ee013a661b7f1770f561d3ef (patch) | |
tree | 79dd9a5dd12d305e1be7b926d414855377d2e192 /MAINTAINERS | |
parent | dbf4ccd6043e58ed32fbf253fb3f0a9991e4c13a (diff) | |
parent | eae936e21bd726f9d9555f2262d439fbcd61dccf (diff) |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 97bc927d2c55..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 |