diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 19:13:19 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 19:13:19 +0200 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /MAINTAINERS | |
| parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff) | |
| parent | [PATCH] s390: fix cmm kernel thread handling (diff) | |
| download | linux-c226951b93f7cd7c3a10b17384535b617bd43fd0.tar.xz linux-c226951b93f7cd7c3a10b17384535b617bd43fd0.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd446e251d5b..63673e6513b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -443,6 +443,23 @@ W: http://people.redhat.com/sgrubb/audit/ T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git S: Maintained +AVR32 ARCHITECTURE +P: Atmel AVR32 Support Team +M: avr32@atmel.com +P: Haavard Skinnemoen +M: hskinnemoen@atmel.com +W: http://www.atmel.com/products/AVR32/ +W: http://avr32linux.org/ +W: http://avrfreaks.net/ +S: Supported + +AVR32/AT32AP MACHINE SUPPORT +P: Atmel AVR32 Support Team +M: avr32@atmel.com +P: Haavard Skinnemoen +M: hskinnemoen@atmel.com +S: Supported + AX.25 NETWORK LAYER P: Ralf Baechle M: ralf@linux-mips.org @@ -2031,6 +2048,13 @@ L: netfilter@lists.netfilter.org L: netfilter-devel@lists.netfilter.org S: Supported +NETLABEL +P: Paul Moore +M: paul.moore@hp.com +W: http://netlabel.sf.net +L: netdev@vger.kernel.org +S: Supported + NETROM NETWORK LAYER P: Ralf Baechle M: ralf@linux-mips.org |