aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-26 13:13:19 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-26 13:13:19 -0400
commitc226951b93f7cd7c3a10b17384535b617bd43fd0 (patch)
tree07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /MAINTAINERS
parentb0df3bd1e553e901ec7297267611a5db88240b38 (diff)
parente8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS24
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/
443T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git 443T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
444S: Maintained 444S: Maintained
445 445
446AVR32 ARCHITECTURE
447P: Atmel AVR32 Support Team
448M: avr32@atmel.com
449P: Haavard Skinnemoen
450M: hskinnemoen@atmel.com
451W: http://www.atmel.com/products/AVR32/
452W: http://avr32linux.org/
453W: http://avrfreaks.net/
454S: Supported
455
456AVR32/AT32AP MACHINE SUPPORT
457P: Atmel AVR32 Support Team
458M: avr32@atmel.com
459P: Haavard Skinnemoen
460M: hskinnemoen@atmel.com
461S: Supported
462
446AX.25 NETWORK LAYER 463AX.25 NETWORK LAYER
447P: Ralf Baechle 464P: Ralf Baechle
448M: ralf@linux-mips.org 465M: ralf@linux-mips.org
@@ -2031,6 +2048,13 @@ L: netfilter@lists.netfilter.org
2031L: netfilter-devel@lists.netfilter.org 2048L: netfilter-devel@lists.netfilter.org
2032S: Supported 2049S: Supported
2033 2050
2051NETLABEL
2052P: Paul Moore
2053M: paul.moore@hp.com
2054W: http://netlabel.sf.net
2055L: netdev@vger.kernel.org
2056S: Supported
2057
2034NETROM NETWORK LAYER 2058NETROM NETWORK LAYER
2035P: Ralf Baechle 2059P: Ralf Baechle
2036M: ralf@linux-mips.org 2060M: ralf@linux-mips.org