diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0acf9ab3d287..ae8820e173a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1278,7 +1278,6 @@ F: drivers/input/misc/ati_remote2.c | |||
1278 | ATLX ETHERNET DRIVERS | 1278 | ATLX ETHERNET DRIVERS |
1279 | M: Jay Cliburn <jcliburn@gmail.com> | 1279 | M: Jay Cliburn <jcliburn@gmail.com> |
1280 | M: Chris Snook <chris.snook@gmail.com> | 1280 | M: Chris Snook <chris.snook@gmail.com> |
1281 | M: Jie Yang <jie.yang@atheros.com> | ||
1282 | L: netdev@vger.kernel.org | 1281 | L: netdev@vger.kernel.org |
1283 | W: http://sourceforge.net/projects/atl1 | 1282 | W: http://sourceforge.net/projects/atl1 |
1284 | W: http://atl1.sourceforge.net | 1283 | W: http://atl1.sourceforge.net |
@@ -1574,7 +1573,6 @@ F: drivers/scsi/bfa/ | |||
1574 | 1573 | ||
1575 | BROCADE BNA 10 GIGABIT ETHERNET DRIVER | 1574 | BROCADE BNA 10 GIGABIT ETHERNET DRIVER |
1576 | M: Rasesh Mody <rmody@brocade.com> | 1575 | M: Rasesh Mody <rmody@brocade.com> |
1577 | M: Debashis Dutt <ddutt@brocade.com> | ||
1578 | L: netdev@vger.kernel.org | 1576 | L: netdev@vger.kernel.org |
1579 | S: Supported | 1577 | S: Supported |
1580 | F: drivers/net/bna/ | 1578 | F: drivers/net/bna/ |
@@ -1758,7 +1756,6 @@ F: Documentation/zh_CN/ | |||
1758 | 1756 | ||
1759 | CISCO VIC ETHERNET NIC DRIVER | 1757 | CISCO VIC ETHERNET NIC DRIVER |
1760 | M: Christian Benvenuti <benve@cisco.com> | 1758 | M: Christian Benvenuti <benve@cisco.com> |
1761 | M: Vasanthy Kolluri <vkolluri@cisco.com> | ||
1762 | M: Roopa Prabhu <roprabhu@cisco.com> | 1759 | M: Roopa Prabhu <roprabhu@cisco.com> |
1763 | M: David Wang <dwang2@cisco.com> | 1760 | M: David Wang <dwang2@cisco.com> |
1764 | S: Supported | 1761 | S: Supported |
@@ -4415,7 +4412,8 @@ L: netfilter@vger.kernel.org | |||
4415 | L: coreteam@netfilter.org | 4412 | L: coreteam@netfilter.org |
4416 | W: http://www.netfilter.org/ | 4413 | W: http://www.netfilter.org/ |
4417 | W: http://www.iptables.org/ | 4414 | W: http://www.iptables.org/ |
4418 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git | 4415 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git |
4416 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git | ||
4419 | S: Supported | 4417 | S: Supported |
4420 | F: include/linux/netfilter* | 4418 | F: include/linux/netfilter* |
4421 | F: include/linux/netfilter/ | 4419 | F: include/linux/netfilter/ |