diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:34 -0400 |
| commit | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (patch) | |
| tree | c6d841ae9b73d6b7d6a887c21ce378cebc9c97f7 /MAINTAINERS | |
| parent | 09e590e5d5a93f2eaa748a89c623258e6bad1648 (diff) | |
| parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e3e1515ba5a9..21116cc3b4a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2656,6 +2656,14 @@ M: chrisw@sous-sol.org | |||
| 2656 | L: stable@kernel.org | 2656 | L: stable@kernel.org |
| 2657 | S: Maintained | 2657 | S: Maintained |
| 2658 | 2658 | ||
| 2659 | STABLE BRANCH: | ||
| 2660 | P: Greg Kroah-Hartman | ||
| 2661 | M: greg@kroah.com | ||
| 2662 | P: Chris Wright | ||
| 2663 | M: chrisw@sous-sol.org | ||
| 2664 | L: stable@kernel.org | ||
| 2665 | S: Maintained | ||
| 2666 | |||
| 2659 | TPM DEVICE DRIVER | 2667 | TPM DEVICE DRIVER |
| 2660 | P: Kylene Hall | 2668 | P: Kylene Hall |
| 2661 | M: kjhall@us.ibm.com | 2669 | M: kjhall@us.ibm.com |