diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /MAINTAINERS | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' 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 dbcf1d272769..8eeaaea838fe 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 |