diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 12:55:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 12:55:20 -0700 |
| commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
| tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /MAINTAINERS | |
| parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
| parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c57c2e6c8d27..ca4131ea5f7b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3654,6 +3654,7 @@ NETWORKING [GENERAL] M: "David S. Miller" <davem@davemloft.net> L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net +W: http://patchwork.ozlabs.org/project/netdev/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git S: Maintained F: net/ @@ -5635,6 +5636,13 @@ S: Maintained F: drivers/vlynq/vlynq.c F: include/linux/vlynq.h +VMWARE VMXNET3 ETHERNET DRIVER +M: Shreyas Bhatewara <sbhatewara@vmware.com> +M: VMware, Inc. <pv-drivers@vmware.com> +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/vmxnet3/ + VOLTAGE AND CURRENT REGULATOR FRAMEWORK M: Liam Girdwood <lrg@slimlogic.co.uk> M: Mark Brown <broonie@opensource.wolfsonmicro.com> |