diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:41:56 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:41:56 +0400 |
| commit | cd97824994042b809493807ea644ba26c0c23290 (patch) | |
| tree | 705d9d069130330d4d9d2a23cd9ff99ec8187f28 /MAINTAINERS | |
| parent | 3307f19f634dfb134b370c59a778fdb2d574c17b (diff) | |
| parent | 3664090e199f10cb0282097faae8f8ca58c1e4ae (diff) | |
| download | linux-cd97824994042b809493807ea644ba26c0c23290.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits)
phylib: Fix delay argument of schedule_delayed_work
NET/ixgbe: Fix powering off during shutdown
NET/e1000e: Fix powering off during shutdown
NET/e1000: Fix powering off during shutdown
packet: avoid warnings when high-order page allocation fails
gianfar: stop send queue before resetting gianfar
myr10ge: again fix lro_gen_skb() alignment
declance: convert to net_device_ops
bfin_mac: convert to net_device_ops
au1000: convert to net_device_ops
atarilance: convert to net_device_ops
a2065: convert to net_device_ops
ixgbe: update real_num_tx_queues on changing num_rx_queues
ixgbe: fix tx queue index
Revert "rose: zero length frame filtering in af_rose.c"
sfc: Use correct macro to set event bitfield
sfc: Match calls to netif_napi_add() and netif_napi_del()
bonding: Remove debug printk
e1000/e1000: fix compile warning
ehea: Fix incomplete conversion to net_device_ops
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0cb20d821694..abbedb658c29 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3917,19 +3917,12 @@ F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c F: include/linux/nbd.h -NETWORK DEVICE DRIVERS -P: Jeff Garzik -M: jgarzik@pobox.com -L: netdev@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git -S: Maintained -F: drivers/net/ - NETWORKING [GENERAL] -P: Networking Team -M: netdev@vger.kernel.org +P: David S. Miller +M: davem@davemloft.net L: netdev@vger.kernel.org W: http://linux-net.osdl.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git S: Maintained F: net/ F: include/net/ |