diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 23:20:55 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 23:20:55 +0200 |
commit | a422142cfdf90d889d8d3e2affb8311a381530b7 (patch) | |
tree | bde7e2c7a3ee8bca649aecd877a9ee1593f4223e /MAINTAINERS | |
parent | [PATCH] skge: version 1.7 (diff) | |
parent | Linux v2.6.18-rc5 (diff) | |
download | linux-a422142cfdf90d889d8d3e2affb8311a381530b7.tar.xz linux-a422142cfdf90d889d8d3e2affb8311a381530b7.zip |
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 T: git http://tali.admingilde.org/git/linux-docbook.git S: Maintained +DOCKING STATION DRIVER +P: Kristen Carlson Accardi +M: kristen.c.accardi@intel.com +L: linux-acpi@vger.kernel.org +S: Maintained + DOUBLETALK DRIVER P: James R. Van Zandt M: jrv@vanzandt.mv.com |