diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-14 21:33:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-14 21:33:54 +0200 |
| commit | e9ffb3d7ec94083a44a8721681391beca2ffd68c (patch) | |
| tree | 6768ab487b3f44c2a4995ee61307e47760ca9b88 /MAINTAINERS | |
| parent | Merge branch 'upstream-fixes' into upstream (diff) | |
| parent | [INET]: Use pskb_trim_unique when trimming paged unique skbs (diff) | |
| download | linux-e9ffb3d7ec94083a44a8721681391beca2ffd68c.tar.xz linux-e9ffb3d7ec94083a44a8721681391beca2ffd68c.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4af1c6dc96f6..dbcf1d272769 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -298,6 +298,13 @@ L: info-linux@geode.amd.com W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html S: Supported +AOA (Apple Onboard Audio) ALSA DRIVER +P: Johannes Berg +M: johannes@sipsolutions.net +L: linuxppc-dev@ozlabs.org +L: alsa-devel@alsa-project.org +S: Maintained + APM DRIVER P: Stephen Rothwell M: sfr@canb.auug.org.au @@ -2653,6 +2660,22 @@ M: dbrownell@users.sourceforge.net L: spi-devel-general@lists.sourceforge.net 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 + +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 |