diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /MAINTAINERS | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 21116cc3b4a5..3bab239e82fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -889,6 +889,12 @@ M: rdunlap@xenotime.net | |||
| 889 | T: git http://tali.admingilde.org/git/linux-docbook.git | 889 | T: git http://tali.admingilde.org/git/linux-docbook.git |
| 890 | S: Maintained | 890 | S: Maintained |
| 891 | 891 | ||
| 892 | DOCKING STATION DRIVER | ||
| 893 | P: Kristen Carlson Accardi | ||
| 894 | M: kristen.c.accardi@intel.com | ||
| 895 | L: linux-acpi@vger.kernel.org | ||
| 896 | S: Maintained | ||
| 897 | |||
| 892 | DOUBLETALK DRIVER | 898 | DOUBLETALK DRIVER |
| 893 | P: James R. Van Zandt | 899 | P: James R. Van Zandt |
| 894 | M: jrv@vanzandt.mv.com | 900 | M: jrv@vanzandt.mv.com |