diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e3e1515ba5a..25cd7073a20 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 |
@@ -2656,6 +2662,14 @@ M: chrisw@sous-sol.org | |||
2656 | L: stable@kernel.org | 2662 | L: stable@kernel.org |
2657 | S: Maintained | 2663 | S: Maintained |
2658 | 2664 | ||
2665 | STABLE BRANCH: | ||
2666 | P: Greg Kroah-Hartman | ||
2667 | M: greg@kroah.com | ||
2668 | P: Chris Wright | ||
2669 | M: chrisw@sous-sol.org | ||
2670 | L: stable@kernel.org | ||
2671 | S: Maintained | ||
2672 | |||
2659 | TPM DEVICE DRIVER | 2673 | TPM DEVICE DRIVER |
2660 | P: Kylene Hall | 2674 | P: Kylene Hall |
2661 | M: kjhall@us.ibm.com | 2675 | M: kjhall@us.ibm.com |
@@ -3282,10 +3296,11 @@ S: Maintained | |||
3282 | 3296 | ||
3283 | XFS FILESYSTEM | 3297 | XFS FILESYSTEM |
3284 | P: Silicon Graphics Inc | 3298 | P: Silicon Graphics Inc |
3299 | P: Tim Shimmin, David Chatterton | ||
3285 | M: xfs-masters@oss.sgi.com | 3300 | M: xfs-masters@oss.sgi.com |
3286 | M: nathans@sgi.com | ||
3287 | L: xfs@oss.sgi.com | 3301 | L: xfs@oss.sgi.com |
3288 | W: http://oss.sgi.com/projects/xfs | 3302 | W: http://oss.sgi.com/projects/xfs |
3303 | T: git git://oss.sgi.com:8090/xfs/xfs-2.6 | ||
3289 | S: Supported | 3304 | S: Supported |
3290 | 3305 | ||
3291 | X86 3-LEVEL PAGING (PAE) SUPPORT | 3306 | X86 3-LEVEL PAGING (PAE) SUPPORT |