diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:25:47 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:25:47 +0200 |
| commit | 49666145de54b5d6d256442bb1bec03ffae1ac76 (patch) | |
| tree | b79bcaabffa18847cab31efdf798dc5740e8d73b /MAINTAINERS | |
| parent | [PATCH] remove unnecessary config.h includes from drivers/net/ (diff) | |
| parent | Merge branch 'master' into upstream-fixes (diff) | |
| download | linux-49666145de54b5d6d256442bb1bec03ffae1ac76.tar.xz linux-49666145de54b5d6d256442bb1bec03ffae1ac76.zip | |
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 L: stable@kernel.org S: Maintained +STABLE BRANCH: +P: Greg Kroah-Hartman +M: greg@kroah.com +P: Chris Wright +M: chrisw@sous-sol.org +L: stable@kernel.org +S: Maintained + TPM DEVICE DRIVER P: Kylene Hall M: kjhall@us.ibm.com |