aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
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
899T: git http://tali.admingilde.org/git/linux-docbook.git 899T: git http://tali.admingilde.org/git/linux-docbook.git
900S: Maintained 900S: Maintained
901 901
902DOCKING STATION DRIVER
903P: Kristen Carlson Accardi
904M: kristen.c.accardi@intel.com
905L: linux-acpi@vger.kernel.org
906S: Maintained
907
902DOUBLETALK DRIVER 908DOUBLETALK DRIVER
903P: James R. Van Zandt 909P: James R. Van Zandt
904M: jrv@vanzandt.mv.com 910M: jrv@vanzandt.mv.com
@@ -2674,6 +2680,14 @@ M: chrisw@sous-sol.org
2674L: stable@kernel.org 2680L: stable@kernel.org
2675S: Maintained 2681S: Maintained
2676 2682
2683STABLE BRANCH:
2684P: Greg Kroah-Hartman
2685M: greg@kroah.com
2686P: Chris Wright
2687M: chrisw@sous-sol.org
2688L: stable@kernel.org
2689S: Maintained
2690
2677TPM DEVICE DRIVER 2691TPM DEVICE DRIVER
2678P: Kylene Hall 2692P: Kylene Hall
2679M: kjhall@us.ibm.com 2693M: kjhall@us.ibm.com