diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
| commit | a422142cfdf90d889d8d3e2affb8311a381530b7 (patch) | |
| tree | bde7e2c7a3ee8bca649aecd877a9ee1593f4223e /MAINTAINERS | |
| parent | 6fc47e31c0e802d205d67e644f654532e5d365d5 (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge branch 'master' 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 d3315a552be1..3bbd7064f947 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 |