diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a050d7cc0856..2d036ffd961f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -899,6 +899,12 @@ M: rdunlap@xenotime.net | |||
899 | T: git http://tali.admingilde.org/git/linux-docbook.git | 899 | T: git http://tali.admingilde.org/git/linux-docbook.git |
900 | S: Maintained | 900 | S: Maintained |
901 | 901 | ||
902 | DOCKING STATION DRIVER | ||
903 | P: Kristen Carlson Accardi | ||
904 | M: kristen.c.accardi@intel.com | ||
905 | L: linux-acpi@vger.kernel.org | ||
906 | S: Maintained | ||
907 | |||
902 | DOUBLETALK DRIVER | 908 | DOUBLETALK DRIVER |
903 | P: James R. Van Zandt | 909 | P: James R. Van Zandt |
904 | M: jrv@vanzandt.mv.com | 910 | M: jrv@vanzandt.mv.com |
@@ -2674,6 +2680,14 @@ M: chrisw@sous-sol.org | |||
2674 | L: stable@kernel.org | 2680 | L: stable@kernel.org |
2675 | S: Maintained | 2681 | S: Maintained |
2676 | 2682 | ||
2683 | STABLE BRANCH: | ||
2684 | P: Greg Kroah-Hartman | ||
2685 | M: greg@kroah.com | ||
2686 | P: Chris Wright | ||
2687 | M: chrisw@sous-sol.org | ||
2688 | L: stable@kernel.org | ||
2689 | S: Maintained | ||
2690 | |||
2677 | TPM DEVICE DRIVER | 2691 | TPM DEVICE DRIVER |
2678 | P: Kylene Hall | 2692 | P: Kylene Hall |
2679 | M: kjhall@us.ibm.com | 2693 | M: kjhall@us.ibm.com |