diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
| commit | 49666145de54b5d6d256442bb1bec03ffae1ac76 (patch) | |
| tree | b79bcaabffa18847cab31efdf798dc5740e8d73b /MAINTAINERS | |
| parent | bcd68373877e74d8ca5039c10dc5d699ba5dc7d0 (diff) | |
| parent | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 13f345cf77ce..d3315a552be1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2674,6 +2674,14 @@ M: chrisw@sous-sol.org | |||
| 2674 | L: stable@kernel.org | 2674 | L: stable@kernel.org |
| 2675 | S: Maintained | 2675 | S: Maintained |
| 2676 | 2676 | ||
| 2677 | STABLE BRANCH: | ||
| 2678 | P: Greg Kroah-Hartman | ||
| 2679 | M: greg@kroah.com | ||
| 2680 | P: Chris Wright | ||
| 2681 | M: chrisw@sous-sol.org | ||
| 2682 | L: stable@kernel.org | ||
| 2683 | S: Maintained | ||
| 2684 | |||
| 2677 | TPM DEVICE DRIVER | 2685 | TPM DEVICE DRIVER |
| 2678 | P: Kylene Hall | 2686 | P: Kylene Hall |
| 2679 | M: kjhall@us.ibm.com | 2687 | M: kjhall@us.ibm.com |