aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS17
1 files changed, 16 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e3e1515ba5a9..25cd7073a20b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -889,6 +889,12 @@ M: rdunlap@xenotime.net
889T: git http://tali.admingilde.org/git/linux-docbook.git 889T: git http://tali.admingilde.org/git/linux-docbook.git
890S: Maintained 890S: Maintained
891 891
892DOCKING STATION DRIVER
893P: Kristen Carlson Accardi
894M: kristen.c.accardi@intel.com
895L: linux-acpi@vger.kernel.org
896S: Maintained
897
892DOUBLETALK DRIVER 898DOUBLETALK DRIVER
893P: James R. Van Zandt 899P: James R. Van Zandt
894M: jrv@vanzandt.mv.com 900M: jrv@vanzandt.mv.com
@@ -2656,6 +2662,14 @@ M: chrisw@sous-sol.org
2656L: stable@kernel.org 2662L: stable@kernel.org
2657S: Maintained 2663S: Maintained
2658 2664
2665STABLE BRANCH:
2666P: Greg Kroah-Hartman
2667M: greg@kroah.com
2668P: Chris Wright
2669M: chrisw@sous-sol.org
2670L: stable@kernel.org
2671S: Maintained
2672
2659TPM DEVICE DRIVER 2673TPM DEVICE DRIVER
2660P: Kylene Hall 2674P: Kylene Hall
2661M: kjhall@us.ibm.com 2675M: kjhall@us.ibm.com
@@ -3282,10 +3296,11 @@ S: Maintained
3282 3296
3283XFS FILESYSTEM 3297XFS FILESYSTEM
3284P: Silicon Graphics Inc 3298P: Silicon Graphics Inc
3299P: Tim Shimmin, David Chatterton
3285M: xfs-masters@oss.sgi.com 3300M: xfs-masters@oss.sgi.com
3286M: nathans@sgi.com
3287L: xfs@oss.sgi.com 3301L: xfs@oss.sgi.com
3288W: http://oss.sgi.com/projects/xfs 3302W: http://oss.sgi.com/projects/xfs
3303T: git git://oss.sgi.com:8090/xfs/xfs-2.6
3289S: Supported 3304S: Supported
3290 3305
3291X86 3-LEVEL PAGING (PAE) SUPPORT 3306X86 3-LEVEL PAGING (PAE) SUPPORT