Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Apr 2009 00:35:26 +0000 (17:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Apr 2009 00:35:26 +0000 (17:35 -0700)
commita54bfa40fd16aeb90bc556189221576f746f8567
tree176bb7a99ffab5f42f0dd4e9671f335be3f3efa0
parentfe957c40ec5e2763b9977c565beab3bde3aaf85b
parent134ffb4cad92a6aa534e55a9be145bca780a32c1
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
MAINTAINERS
drivers/net/fec.c
drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_82599.c
drivers/net/ixgbe/ixgbe_common.c
drivers/net/ixgbe/ixgbe_main.c
net/8021q/vlan_core.c
net/core/dev.c