diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:43:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:43:01 +1000 |
| commit | bf1a539bb3079ccfc61eb95012d4766d10b28dd1 (patch) | |
| tree | 31a1e8e93df9421a97623619f09d53bb0c7abbf1 /MAINTAINERS | |
| parent | 214d3fbe9336e076a9c0273ae0f1cb9258f1e063 (diff) | |
| parent | 6d0722a2cec2c23db3b0855ff8bb433175a16b44 (diff) | |
Merge remote branch 'net/master'
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/ipv4/Kconfig
net/ipv4/tcp_timer.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d05479c4e0a5..6ada2e3e7ca5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1412,6 +1412,13 @@ L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/bfa/ +BROCADE BNA 10 GIGABIT ETHERNET DRIVER +M: Rasesh Mody <rmody@brocade.com> +M: Debashis Dutt <ddutt@brocade.com> +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/bna/ + BSG (block layer generic sg v4 driver) M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> L: linux-scsi@vger.kernel.org @@ -2903,6 +2910,12 @@ M: Brian King <brking@us.ibm.com> S: Supported F: drivers/scsi/ipr.* +IBM Power Virtual Ethernet Device Driver +M: Santiago Leon <santil@linux.vnet.ibm.com> +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ibmveth.* + IBM ServeRAID RAID DRIVER P: Jack Hammer M: Dave Jeffery <ipslinux@adaptec.com> @@ -6599,6 +6612,20 @@ M: "Maciej W. Rozycki" <macro@linux-mips.org> S: Maintained F: drivers/serial/zs.* +GRE DEMULTIPLEXER DRIVER +M: Dmitry Kozlov <xeb@mail.ru> +L: netdev@vger.kernel.org +S: Maintained +F: net/ipv4/gre.c +F: include/net/gre.h + +PPTP DRIVER +M: Dmitry Kozlov <xeb@mail.ru> +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/pptp.c +W: http://sourceforge.net/projects/accel-pptp + THE REST M: Linus Torvalds <torvalds@linux-foundation.org> L: linux-kernel@vger.kernel.org |